diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42b33a8e81c05569952177a3e232e525517f32b3..87c4b4d9159c6648bf60fef24793f9ae0c38c259 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,16 +25,16 @@ job_build-image: - name: docker:20.10.12-dind before_script: - apk add --no-cache docker-compose - - docker info - - docker-compose --version + # - docker info + # - docker-compose --version script: # - docker-compose up #--tag "${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA}" ps - - docker-compose up -d --build + # - docker-compose up -d --build - docker build --file "app/server/Containerfile" --tag "${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA}" - # - docker ps - # - docker network list + # # - docker ps + # # - docker network list # # NOTE: push image to local registry so that it can be accessed in subsequent jobs - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} diff --git a/docker-compose.yml b/docker-compose.yml index 1721ae53786337721067734e25b897d14d4ee941..ab95135a267373e2c8e3d832033e83c0c729516f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: - mongodb:/.local/db/data/db app: container_name: node-mongo-app - # image: .name:rc2 + image: ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA} restart: always build: ./app/server ports: