diff --git a/.gitlab-ci-template.yml b/.gitlab-ci-template.yml index 70fe6c4..701a5bd 100644 --- a/.gitlab-ci-template.yml +++ b/.gitlab-ci-template.yml @@ -26,6 +26,8 @@ if [ -n "$BUILD_FOLDER" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg BUILD_FOLDER=$BUILD_FOLDER"; fi if [ -n "$IMAGE_NAME" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg IMAGE_NAME=$IMAGE_NAME"; fi if [ -n "$MAIN_CLASS" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg MAIN_CLASS=$MAIN_CLASS"; fi + if [ -n "$BUILD_ARGS" ]; then BUILD_ARGS="$BUILD_ARGS $BUILD_ARGS" fi + docker build $BUILD_ARGS -t $DOCKER_IMAGE:$TAG -f $DOCKERFILE_PATH . if [[ "$TAG" == "dev" || "$TAG" == "production" || "$TAG" == "pipeline" ]]; then diff --git a/frontend/.gitlab-ci.yml b/frontend/.gitlab-ci.yml index ff7825d..99b6ccb 100644 --- a/frontend/.gitlab-ci.yml +++ b/frontend/.gitlab-ci.yml @@ -19,5 +19,6 @@ docker_frontend: IMAGE_NAME: frontend WORKDIR_PATH: frontend DOCKERFILE_PATH: Dockerfile + BUILD_ARGS: "--build-arg HCAPTCHA_SITE_KEY=$HCAPTCHA_SITE_KEY" needs: - build_frontend