diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1310d0..c91e5e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,10 +41,12 @@ versionize: - echo -n $API_VERSION > api_version.txt - echo -n $API_MAJOR_VERSION > api_major_version.txt - CONTAINER_NAME="${CI_PROJECT_PATH_SLUG}-${INSTANCE_SPECIFIER}-${API_MAJOR_VERSION}" + - SERVICE_VOLUME="${CONTAINER_NAME}-data" - SERVICE_PORT=$((SERVICE_FIRST_PORT + SERVICE_PORT_OFFSET + (API_MAJOR_VERSION - 1) % 5)) - echo "Service port is ${SERVICE_PORT}" + - docker volume inspect $SERVICE_VOLUME || docker volume create $SERVICE_VOLUME - docker stop $CONTAINER_NAME || echo "$CONTAINER_NAME not running, anyway okay" - docker pull $IMAGE_NAME:$VERSION - - echo "docker run -d --rm -e TZ=Europe/Berlin -p $SERVICE_PORT:$WEBSERVICE_PORT --name $CONTAINER_NAME -e WEBSERVICE_INSTANCE=$INSTANCE_SPECIFIER -e Database__Host=$DATABASE_HOST -e Database__User=$DATABASE_USER -e Database__Password=$DATABASE_PASSWORD -e Database__Name=$DATABASE_NAME $IMAGE_NAME:$VERSION" > /start-scripts/${CONTAINER_NAME}.sh + - echo "docker run -d --rm -e TZ=Europe/Berlin -p $SERVICE_PORT:$WEBSERVICE_PORT --name $CONTAINER_NAME -e WEBSERVICE_INSTANCE=$INSTANCE_SPECIFIER $IMAGE_NAME:$VERSION" > /start-scripts/${CONTAINER_NAME}.sh - chmod 755 /start-scripts/${CONTAINER_NAME}.sh - /start-scripts/${CONTAINER_NAME}.sh diff --git a/Dockerfile b/Dockerfile index 782a98b..e8d9477 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,8 @@ RUN cd /tmp/work && ./generateAll.sh -k2c # final container FROM wollud1969/dotnetcore5sdk:1.0.0 +ENV Database__InfoFile "/opt/service/config/databaseInfo.json" + RUN \ useradd -d /opt/service -m service && \ mkdir /opt/service/output && chown service:service /opt/service/output && \