diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e71fd13fa3f9d09f2c117356bde7e9f7f0d8a1a..b8001ceefbe09ca71dfffbedb7ddcd577200a8ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,7 @@ variables: ################################################################################ # Build and push anchor .build_and_push_docker_image: &build_and_push_docker_image - # - docker build --pull --tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" . - - docker build -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" - < $DOCKER_FILE + - docker build --pull --tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" . - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" # Docker Authentification anchor @@ -48,7 +47,6 @@ Build Calqul: DOCKER_TLS_CERTDIR: "" NAMESPACE_ENV: "d01" IMAGE_NAME: calqul-$NAMESPACE_ENV - DOCKER_FILE: ./calqul.Dockerfile rules: - if: $CI_COMMIT_BRANCH == "cicd" - changes: # build image only if sources have changed. diff --git a/calqul.Dockerfile b/Dockerfile similarity index 100% rename from calqul.Dockerfile rename to Dockerfile