Skip to content
Snippets Groups Projects
Commit 4605f3a9 authored by Lennart Kramer's avatar Lennart Kramer
Browse files

always load library

parent 328c20cb
No related branches found
No related tags found
No related merge requests found
...@@ -33,23 +33,3 @@ build_webservice: ...@@ -33,23 +33,3 @@ build_webservice:
- docker login -u mathinstitut -p "$DOCKERHUB_PASS" - docker login -u mathinstitut -p "$DOCKERHUB_PASS"
script: script:
- ./build.sh "$REGISTRY" "$CI_COMMIT_TAG" - ./build.sh "$REGISTRY" "$CI_COMMIT_TAG"
test_maxima:
image: "$REGISTRY/moodle-ci-stack"
stage: test_maxima
services:
- postgres:latest
variables:
MOODLE_BRANCH: "MOODLE_37_STABLE"
QSTACK_VERSION: "v4.3.2"
DB: "pgsql"
POSTGRES_USER: "postgres"
POSTGRES_PASSWORD: ""
POSTGRES_HOST_AUTH_METHOD: "trust"
TRAVIS_BUILD_DIR: "$CI_PROJECT_DIR"
TEST_URL: "http://2020042000.kub00.math.uni-goettingen.de/MaximaPool"
tags:
- docker
script:
- bash testimage.sh
when: manual
...@@ -85,7 +85,6 @@ RUN grep stackmaximaversion ${LIB}/stackmaxima.mac | grep -oP "\d+" >> /opt/maxi ...@@ -85,7 +85,6 @@ RUN grep stackmaximaversion ${LIB}/stackmaxima.mac | grep -oP "\d+" >> /opt/maxi
# Add go webserver # Add go webserver
COPY ./bin/web ${BIN}/goweb COPY ./bin/web ${BIN}/goweb
ARG MAX_LIB_PATH='' ENV GOEMAXIMA_LIB_PATH=/opt/maxima/assets/maximalocal.mac
ENV GOEMAXIMA_LIB_PATH=$MAX_LIB_PATH
CMD rm /dev/tty && cd /tmp && rm --one-file-system -rf * && exec tini ${BIN}/goweb ${BIN}/maxima-optimised CMD rm /dev/tty && cd /tmp && rm --one-file-system -rf * && exec tini ${BIN}/goweb ${BIN}/maxima-optimised
...@@ -13,11 +13,7 @@ echo "stack: $3" ...@@ -13,11 +13,7 @@ echo "stack: $3"
IMAGENAME="goemaxima:$3" IMAGENAME="goemaxima:$3"
docker pull "$5/$IMAGENAME-dev" docker pull "$5/$IMAGENAME-dev"
# build it # build it
if [ "$3" = "2017121800" ]; then
docker build -t "${IMAGENAME}" --build-arg MAXIMA_VERSION="$2" --build-arg SBCL_VERSION="$1" --build-arg LIB_PATH="$4" --build-arg "MAX_LIB_PATH=/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 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." echo "${IMAGENAME} wurde erfolgreich gebaut."
# push the image # push the image
docker tag "$IMAGENAME" "$5/$IMAGENAME-dev" docker tag "$IMAGENAME" "$5/$IMAGENAME-dev"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment