diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d836270f29062c92bf342c86d71203ada06280e..054cf58944d5b7820f1d5aaeb0a56bbb492ce829 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,23 +33,3 @@ build_webservice: - docker login -u mathinstitut -p "$DOCKERHUB_PASS" script: - ./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 diff --git a/Dockerfile b/Dockerfile index 235aa1c75dc3dbd8925149140d36053488704e83..16e39eca8f58fdd3bcbb973556d3e55c45c58312 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,7 +85,6 @@ RUN grep stackmaximaversion ${LIB}/stackmaxima.mac | grep -oP "\d+" >> /opt/maxi # Add go webserver COPY ./bin/web ${BIN}/goweb -ARG MAX_LIB_PATH='' -ENV GOEMAXIMA_LIB_PATH=$MAX_LIB_PATH +ENV GOEMAXIMA_LIB_PATH=/opt/maxima/assets/maximalocal.mac 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 da8b8dcfeddd07f731a0c72fffcd672c272b1041..6dc35cda0ca7e073354fa70534fdf7f212fad170 100755 --- a/buildimage.sh +++ b/buildimage.sh @@ -13,11 +13,7 @@ echo "stack: $3" IMAGENAME="goemaxima:$3" docker pull "$5/$IMAGENAME-dev" # 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 -fi +docker build -t "${IMAGENAME}" --build-arg MAXIMA_VERSION="$2" --build-arg SBCL_VERSION="$1" --build-arg LIB_PATH="$4" . || exit 1 echo "${IMAGENAME} wurde erfolgreich gebaut." # push the image docker tag "$IMAGENAME" "$5/$IMAGENAME-dev"