diff --git a/Dockerfile b/Dockerfile index 3310c58930165bb6abbe775133ff11c8587fadb6..645d3c09d1c9aaad0ba504437d7ade09a609d12c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,5 +93,8 @@ RUN for i in $(seq 16); do \ # Add go webserver COPY ./bin/web ${BIN}/goweb +ARG LIB_PATH='' +ENV GOEMAXIMA_LIB_PATH=$LIB_PATH + CMD rm /dev/tty && cd /tmp && rm --one-file-system -rf * && exec tini ${BIN}/goweb ${BIN}/maxima-optimised diff --git a/buildimage.sh b/buildimage.sh index 2a72cb2ca206603249c7c907b05326c42510a445..c93a03376468b7d0af1a3ebc36695ab44f95ec55 100755 --- a/buildimage.sh +++ b/buildimage.sh @@ -14,7 +14,11 @@ IMAGENAME="$5/goemaxima:$3" # check if the image already exists on the server docker pull "${IMAGENAME}" # build it -docker build -t "${IMAGENAME}" --build-arg MAXIMA_VERSION="$2" --build-arg SBCL_VERSION="$1" --build-arg LIB_PATH="$4" . || exit 1 +if [ "$stack" = "2017121800" ]; then + docker build -t "${IMAGENAME}" --build-arg MAXIMA_VERSION="$2" --build-arg SBCL_VERSION="$1" --build-arg LIB_PATH="$4" --build-arg "/opt/maxima/assets/maximalocal.mac" . || exit 1 +else + docker build -t "${IMAGENAME}" --build-arg MAXIMA_VERSION="$2" --build-arg SBCL_VERSION="$1" --build-arg LIB_PATH="$4" . || exit 1 +fi echo "${IMAGENAME} wurde erfolgreich gebaut." # testing? # push it