From eb6b7b13f7607efe466bdb645ec9ea7ea3d2fb9b Mon Sep 17 00:00:00 2001
From: derrabauke <pfralf@googlemail.com>
Date: Tue, 16 Mar 2021 01:10:51 +0100
Subject: [PATCH] up to container registry again!
---
.gitlab-ci.yml | 16 ++++++----------
TODOS.md | 4 ++--
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50f0f83..9719018 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,12 +48,10 @@ build_client:
services:
- docker:19.03.12-dind
before_script:
- - echo $CI_REGISTRY
- - echo $CI_REGISTRY_USER
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
variables:
- CLIENT_IMAGE_TAG: $CI_REGISTRY/devops-project/app/client:$CI_COMMIT_TAG
- CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app/client:latest
+ CLIENT_IMAGE_TAG: $CI_REGISTRY/devops-project/app:client$CI_COMMIT_TAG
+ CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app:clientlatest
script:
- cd app/client
- docker build -t $CLIENT_IMAGE_TAG .
@@ -72,15 +70,13 @@ build_server:
services:
- docker:19.03.12-dind
before_script:
- - echo $CI_REGISTRY
- - echo $CI_REGISTRY_USER
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
variables:
- SERVER_IMAGE_TAG: $CI_REGISTRY/devops-project/app/server:$CI_COMMIT_TAG
- SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app/server:latest
+ SERVER_IMAGE_TAG: $CI_REGISTRY_IMAGE/devops-project/app:server$CI_COMMIT_TAG
+ SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app:serverlatest
script:
- cd app/server
- docker build -t $SERVER_IMAGE_TAG .
- docker tag $SERVER_IMAGE_TAG $SERVER_RELEASE_IMAGE_TAG
- - docker image push $SERVER_IMAGE_TAG
- - docker image push $SERVER_RELEASE_IMAGE_TAG
+ - docker push $SERVER_IMAGE_TAG
+ - docker push $SERVER_RELEASE_IMAGE_TAG
diff --git a/TODOS.md b/TODOS.md
index f9cfb9c..dfef18c 100644
--- a/TODOS.md
+++ b/TODOS.md
@@ -12,8 +12,8 @@
- [x] client helm chart
- [ ] server/backend chart with mongodb dependency
- [x] backend image running
- - [ ] mongodb pvc setup working
- - [ ] connect backend <-> mongodb
+ - [x] mongodb pvc setup working
+ - [x] connect backend <-> mongodb
- [ ] working replicaCount increase
- [ ] Document test setup in minikube for testing the helm charts?
--
GitLab