diff --git a/Dockerfile b/Dockerfile index 5ff2533458c269031ce6ed632ad0c21d24d319fe..3a9d53c8f8996efa47a09a9c3ce647ea1e089970 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV REVNUM=$REVNUM ARG PYTHON_VERSION=39 ARG TRIM=cspp ENV PORTABLESHELLB3=true -ENV MAKEFLAGS=-j40 +ENV MAKEFLAGS=-j0 RUN ./shallbethree.sh mk_gcc11 ARG LINUXCPUFLAGS="-march=x86-64 -fPIC" ENV LINUXCPUFLAGS="${LINUXCPUFLAGS}" diff --git a/build.sh b/build.sh index 084642ce7ec469380949dbe1eaf500a888a403e6..c05e2c19f2707de3cdc09e7a819323d40fd7b541 100755 --- a/build.sh +++ b/build.sh @@ -1,14 +1,14 @@ -#sh!/bin/bash -ex -git diff $tag +#!/bin/bash -ex # git rev-parse --short ${TAG} -export REVNUM=$( git rev-parse --verify HEAD --short ) -echo building rGIT${REVNUM} -sleep 1 -docker build --build-arg REVNUM=GIT$( git rev-parse --verify HEAD --short ) \ +export REVNUM="$( git rev-parse --verify HEAD --short )" +echo "building rGIT${REVNUM}" +sleep 2 +docker build --build-arg REVNUM="GIT${REVNUM}" \ -f Dockerfile \ -t shellb3-cspp-py3:latest \ -t gitlab.ssec.wisc.edu:5555/cspp/buildbucket/shellb3/shellb3-centos7-gcc11-cspp-py3:rGIT${REVNUM} \ - -t gitlab.ssec.wisc.edu:5555/cspp/buildbucket/shellb3/shellb3-centos7-gcc11-cspp-py3:latest + -t gitlab.ssec.wisc.edu:5555/cspp/buildbucket/shellb3/shellb3-centos7-gcc11-cspp-py3:latest | + tee docker-build.log 2>&1 DOCK=${DOCK:-$HOME/dock} test -d "$DOCK" || mkdir -p "$DOCK"