From 1c2d352b909ba0e3d6d4b5f4d8d583faae4a0dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Wed, 3 Feb 2021 16:42:09 +0100
Subject: [PATCH] =?UTF-8?q?jolesz=20most=20esk=C3=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 12 ------------
k8s/deployment.yml | 4 ++--
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03cd89c..da5a44f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,18 +63,6 @@ Docker build to KSZK registry:
- echo "{\"auths\":{\"registry.kszk.bme.hu\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CONTAINER_IMAGE
-Docker build to Docker Hub registry:
- stage: Docker Build
- tags: [kszk]
- only:
- - tags
- image:
- name: gcr.io/kaniko-project/executor:debug
- entrypoint: ['']
- script:
- - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"$DOCKERHUB_USER\",\"password\":\"$DOCKERHUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination rlacko58/kszkepzes-backend:latest
-
Deploy to Kubernetes:
stage: deploy
image: alpine
diff --git a/k8s/deployment.yml b/k8s/deployment.yml
index 5df38b1..8ec6fca 100644
--- a/k8s/deployment.yml
+++ b/k8s/deployment.yml
@@ -22,7 +22,7 @@ spec:
- name: kszkepzes-media-volume
mountPath: /mediafiles
- name: kszkepzes-backend-migrate
- image: rlacko58/kszkepzes-backend:latest
+ image: registry.kszk.bme.hu/kszk/devteam/kszkepzes-backend:##IMAGETAG##
imagePullPolicy: 'Always'
command: ['python', 'manage.py', 'migrate', '--noinput']
envFrom:
@@ -49,4 +49,4 @@ spec:
persistentVolumeClaim:
claimName: kszkepzes-media-pv-claim
imagePullSecrets:
- - name: kszkepzes-regcred
\ No newline at end of file
+ - name: kszkepzes-regcred
--
GitLab