Commit ef0a6921 authored by LAVENIER's avatar LAVENIER
Browse files

[fix] CI minor changes

parent 94c1c637
......@@ -234,20 +234,22 @@ gitlab-release:
stage: docker
before_script:
# Create the target directory
- mkdir -p target/docker && cp -rf ${APP_WAR_MODULE}/src/main/docker/* target/docker/
- mkdir -p target/docker/config
- cp -rf ${APP_WAR_MODULE}/src/main/docker/* target/docker/
- cp -f ${ARTIFACT_WAR_FILE} target/docker/app.war
- mkdir -p target/docker/config && cp -f ${ARTIFACT_CONFIG_FILES} target/docker/config/
- cp -f ${ARTIFACT_CONFIG_FILES} target/docker/config/
- ls -l target/docker/config
- cd target/docker
# Login to registry
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
# Build docker image
- cd target/docker
- docker pull ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} || true
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} --pull -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} .
- docker push ${CI_REGISTRY_IMAGE}:${IMAGE_TAG}
artifacts:
paths:
- target/docker
expire_in: 60 minutes
docker:develop:
extends: .docker-build
......
......@@ -8,5 +8,8 @@ JAVA_OPTS="$JAVA_OPTS -Doracle.jdbc.timezoneAsRegion=false"
[[ "_${TZ}" != "_" ]] && JAVA_OPTS="$JAVA_OPTS -Duser.timezone=${TZ}"
[[ "_${PORT}" -ne "_" ]] && JAVA_OPTS="$JAVA_OPTS -Dserver.port=${PORT}"
ARGS=${@:2}
JAVA_CMD="java ${JAVA_OPTS} -server -jar ${BASEDIR}/app.war ${ARGS}"
echo "Starting, with arguments: ${ARGS} - profiles: ${PROFILES}"
java ${JAVA_OPTS} -server -jar /app/app.war ${ARGS}
\ No newline at end of file
echo " > ${CMD}"
${JAVA_CMD}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment