From 20229d9d01762efc39455c94dc0869be18284420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lena=20N=C3=B6renberg?= <s80984@beuth-hochschule.de>
Date: Tue, 1 Mar 2022 20:09:38 +0100
Subject: [PATCH] Update build pipeline
---
.gitlab-ci.yml | 10 +++++-----
docker-compose.yml | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42b33a8..87c4b4d 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 1721ae5..ab95135 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:
--
GitLab