Skip to content
Snippets Groups Projects
Commit 66b497d0 authored by maritn's avatar maritn
Browse files

update

parent dad647cf
No related branches found
No related tags found
No related merge requests found
image: "docker:latest" image: "docker:latest"
stages: stages:
- build_maxima_base
- build_submodule - build_submodule
- build_maxima_webservice - build_webservice
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive # GIT_SUBMODULE_STRATEGY: recursive
REGISTRY: "172.30.190.249/" REGISTRY: "172.30.190.249:5000"
BASE1: ${REGISTRY}maxima_base:v01
BASE2: ${REGISTRY}maxima_base:latest
build_maxima_base:
stage: build_maxima_base
tags:
- docker
except:
- master
# only:
# changes:
# - maxima_base/**
script:
- cd maxima_baseimage
- docker build -t ${BASE1} -t ${BASE2} .
- docker push ${BASE1} ${BASE2}
build_submodule: build_submodule:
stage: build_submodule stage: build_submodule
...@@ -38,7 +21,7 @@ build_submodule: ...@@ -38,7 +21,7 @@ build_submodule:
# - webservice/** # - webservice/**
script: script:
- cd goe_web/src/web - cd goe_web/src/web
- go build && GOBIN=${CI_PROJECT_DIR}/maxima_webservice/bin/ go install - go build && GOBIN=${CI_PROJECT_DIR}/bin/ go install
build_maxima_webservice: build_maxima_webservice:
stage: build_maxima_webservice stage: build_maxima_webservice
...@@ -51,10 +34,18 @@ build_maxima_webservice: ...@@ -51,10 +34,18 @@ build_maxima_webservice:
# - maxima_baseimage/** # - maxima_baseimage/**
# - goe_web/** # - goe_web/**
# - maxima_webservice/** # - maxima_webservice/**
variables:
- sbcl_version="2.0.2"
- maxima_version="4.43.1"
- stack_version="stack-2017121800"
script: script:
- NAME1=${REGISTRY}maxima:"$(echo $CI_COMMIT_REF_NAME | sed "s/stack\-//g")" - IMAGENAME=${REGISTRY}"/sbcl"${sbcl_version}"_maxima"${maxima_version}"_"${stack_version}
- echo ${IMAGENAME}
# ./buildimage.sh "2.0.2" "5.43.1" "stack-2017121800" "assStackQuestion/classes/stack/maxima" "172.30.190.249:5000"
-
# - NAME1=${REGISTRY}maxima:"$(echo $CI_COMMIT_REF_NAME | sed "s/stack\-//g")"
# - NAME2=${REGISTRY}maxima:latest # - NAME2=${REGISTRY}maxima:latest
# - cp goe_web/bin/web ${CI_PROJECT_DIR}/maxima_webservice/bin/web # - cp goe_web/bin/web ${CI_PROJECT_DIR}/maxima_webservice/bin/web
# get library path # get library path
- cd maxima_webservice # - cd maxima_webservice
- docker build -t ${NAME1} --build-arg BASEIMAGE=${BASE2} . # - docker build -t ${NAME1} --build-arg BASEIMAGE=${BASE2} .
...@@ -56,7 +56,6 @@ RUN cd ${SRC} \ ...@@ -56,7 +56,6 @@ RUN cd ${SRC} \
&& make clean && make clean
RUN rm -r ${SRC} /SBCL_ARCH RUN rm -r ${SRC} /SBCL_ARCH
RUN apt-get purge -y wget python3 make bzip2 texinfo
RUN apt install -y gnuplot gettext-base RUN apt install -y gnuplot gettext-base
RUN mkdir -p ${LIB} ${LOG} ${TMP} ${PLOT} ${ASSETS} ${BIN} RUN mkdir -p ${LIB} ${LOG} ${TMP} ${PLOT} ${ASSETS} ${BIN}
...@@ -76,6 +75,8 @@ RUN grep stackmaximaversion ${LIB}/stackmaxima.mac | grep -oP "\d+" >> /opt/maxi ...@@ -76,6 +75,8 @@ RUN grep stackmaximaversion ${LIB}/stackmaxima.mac | grep -oP "\d+" >> /opt/maxi
&& mv maxima-optimised ${BIN}/maxima-optimised \ && mv maxima-optimised ${BIN}/maxima-optimised \
&& rm -r ${LIB} && rm -r ${LIB}
RUN apt-get purge -y wget python3 make bzip2 texinfo
# Add go webserver # Add go webserver
COPY ./bin/web ${BIN}/goweb COPY ./bin/web ${BIN}/goweb
CMD ["/opt/maxima/bin/goweb"] CMD ["/opt/maxima/bin/goweb"]
......
Subproject commit e9e412606ed6c17430e564c7990c6dae68489438 Subproject commit 12439ff1a3a16280e115ce1fab4a23b985c90509
build.sh 0 → 100755
#/bin/bash
REGISTRY=$1
apt update && apt install -y cowsay;
for sbcl_version in $(cat sbcl_version); do
for maxima_version in $(cat maxima_version); do
for stack_version in $(cat stack_version); do
IFS=",";
set ${stack_version};
# get right version of stackMaxima
cd assStackQuestion;
git checkout $2
cd ../
./buildimage.sh ${sbcl_version} ${maxima_version} $1 "assStackQuestion/classes/stack/maxima" ${REGISTRY}
unset IFS
done
for moodle_version in $(cat moodle_version); do
cd moodle-qtype_stack
git checkout ${moodle_version}
cd ../
#echo "starting to build image for:"
#echo "sbcl: "${sbcl_version}
#echo "maxima: "${maxima_version}
#echo "moodle: "${moodle_version}
done
done
done
#/bin/bash
# arg1: sbcl version
# arg2: maxima version
# arg3: stack or moodle version: "stack-XXX" or "moodlev.X"
# arg4: LIB_PATH
# arg5: REGISTRY IP
#
echo "starting to build image for:"
echo "sbcl: "$1
echo "maxima: "$2
echo $3
# tag the image
IMAGENAME=$5"/sbcl"$1"_maxima"$2"_"$3
docker build -t ${IMAGENAME} --build-arg MAXIMA_VERSION=$2 --build-arg SBCL_VERSION=$1 --build-arg LIB_PATH=$4 .
# testing!?
cowsay ${IMAGENAME}" wurde erfolgreich gebaut."
return ${IMAGENAME}
5.43.2 5.43.2
5.43.1 5.43.1
5.43.0
5.42.2
5.42.1
5.42.0
5.41.0
5.40.0
5.39.0
5.43.2
5.43.1
5.43.0
5.42.2
5.42.1
5.42.0
5.41.0
5.40.0
5.39.0
Subproject commit a2eb6639c7d59eef31805714ffc18ccfaa0dd3c3 Subproject commit 1cb32dc19faeb428b3b8daca0f72e2478877ed6c
v4.3.0beta3
v4.3.0beta2
v4.3.0beta
v4.3.0alpha
v4.2.3
v4.2.2
v4.2.2a
v4.2.1
v4.2
v4.1
v4.0.1
v4.0
v3.6
v3.5.7
v3.5.6
v3.5.5
v3.5
v3.4
v3.3.3
v3.3.2
v3.3.1
v3.3
v3.2
v3.1
v3.0
v3.0rc1
v3.0beta1
1.4.11 2.0.2
stack 2019090200 stack-2017121800,12439ff1a3a16280e115ce1fab4a23b985c90509
stack 2018030600
stack 2018030500
stack 2017121800
stack 2014083000
stack-2019090200 12439ff1a3a16280e115ce1fab4a23b985c90509
stack-2018030600 12439ff1a3a16280e115ce1fab4a23b985c90509
stack-2018030500 12439ff1a3a16280e115ce1fab4a23b985c90509
stack-2017121800 12439ff1a3a16280e115ce1fab4a23b985c90509
stack-2014083000 9a42ef87ef6a8ae06e8e60bb2eacb7490ba166d3
#!/bin/bash
# arg1 name of testimage
cowsay $1 "cant be tested yet";
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment