From 6e2fc35c8d990cd93033fd03940e6127c5f5faa0 Mon Sep 17 00:00:00 2001
From: "R.K.Garcia" <rkgarcia@wisc.edu>
Date: Fri, 18 Apr 2025 19:26:59 +0000
Subject: [PATCH] fix: build.sh and Dockerfile parallelism
---
Dockerfile | 2 +-
build.sh | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 5ff25334..3a9d53c8 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 084642ce..c05e2c19 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"
--
GitLab