Skip to content
Snippets Groups Projects
Commit 6e2fc35c authored by Ray Garcia's avatar Ray Garcia :scream_cat:
Browse files

fix: build.sh and Dockerfile parallelism

parent 9302e2cd
Branches base_2021Q3
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ ENV REVNUM=$REVNUM ...@@ -15,7 +15,7 @@ ENV REVNUM=$REVNUM
ARG PYTHON_VERSION=39 ARG PYTHON_VERSION=39
ARG TRIM=cspp ARG TRIM=cspp
ENV PORTABLESHELLB3=true ENV PORTABLESHELLB3=true
ENV MAKEFLAGS=-j40 ENV MAKEFLAGS=-j0
RUN ./shallbethree.sh mk_gcc11 RUN ./shallbethree.sh mk_gcc11
ARG LINUXCPUFLAGS="-march=x86-64 -fPIC" ARG LINUXCPUFLAGS="-march=x86-64 -fPIC"
ENV LINUXCPUFLAGS="${LINUXCPUFLAGS}" ENV LINUXCPUFLAGS="${LINUXCPUFLAGS}"
......
#sh!/bin/bash -ex #!/bin/bash -ex
git diff $tag
# git rev-parse --short ${TAG} # git rev-parse --short ${TAG}
export REVNUM=$( git rev-parse --verify HEAD --short ) export REVNUM="$( git rev-parse --verify HEAD --short )"
echo building rGIT${REVNUM} echo "building rGIT${REVNUM}"
sleep 1 sleep 2
docker build --build-arg REVNUM=GIT$( git rev-parse --verify HEAD --short ) \ docker build --build-arg REVNUM="GIT${REVNUM}" \
-f Dockerfile \ -f Dockerfile \
-t shellb3-cspp-py3:latest \ -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: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} DOCK=${DOCK:-$HOME/dock}
test -d "$DOCK" || mkdir -p "$DOCK" test -d "$DOCK" || mkdir -p "$DOCK"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment