diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e86ea93ae3a3fb40af4f9af1ab50d27d345b1e2..3bf1e8112febf23eb22c9170252b3e958c686c80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -301,14 +301,14 @@ agent-prod ocm: stage: deploy-prod extends: .prod-agent-ocm-one rules: - - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "agent" && $CI_PIPELINE_SOURCE != "merge_request_event"' + - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "agent" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS' when: manual agent-prod ocm-two: stage: deploy-prod extends: .prod-agent-ocm-two rules: - - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "agent" && $CI_PIPELINE_SOURCE != "merge_request_event"' + - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "agent" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS' when: manual # engine-prod ocm: diff --git a/apps/agent/deployment/Dockerfile b/apps/agent/deployment/Dockerfile index 7898a50c40d9e3bd7f51559f638265d776530ad7..c41358ed048067a6457510c2c57084673fba406f 100644 --- a/apps/agent/deployment/Dockerfile +++ b/apps/agent/deployment/Dockerfile @@ -1,3 +1,3 @@ FROM nginx:alpine EXPOSE 80 -COPY ./dist . \ No newline at end of file +COPY ./dist .