From d25f4a47d46840b4ee6e789dfc4dab7c74097620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20R=C3=A9thelyi?= <rethelyibalint@gmail.com>
Date: Thu, 14 Oct 2021 12:18:19 +0200
Subject: [PATCH] try another registry

---
 .gitlab-ci.yml               | 74 ++++++++++++++++++------------------
 k8s/templates/deployment.yml |  6 +--
 k8s/templates/secret.yml     | 18 ++++-----
 k8s/values.yaml              |  2 +-
 4 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e408d66..bf066b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,35 +6,10 @@ variables:
 
 
 stages:
-  - pre-build
   - build
-  - docker-build
+  - docker
   - deploy
 
-format:
-  tags: [kszk]
-  image: golang:alpine
-  stage: pre-build
-  before_script:
-    - apk add build-base
-  script:
-    - go fmt $(go list ./... | grep -v /vendor/)
-    - go vet $(go list ./... | grep -v /vendor/)
-    - go test -race $(go list ./... | grep -v /vendor/)
-  rules:
-    - changes:
-        - admin/*
-        - auth/*
-        - db/*
-        - error/*
-        - helpers/*
-        - history/*
-        - homepage/*
-        - k8s/*
-        - topup/*
-        - main.go
-        - go.mod
-
 go_build:
   tags: [kszk]
   image: golang:alpine
@@ -63,19 +38,17 @@ go_build:
         - go.mod
   needs: []
 
-docker:
-  stage: docker-build
-  tags: [kszk]
-  needs:
-    - go_build
-    - format
+dockerhub:
+  stage: docker
   image:
     name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
+    entrypoint: [ "" ]
   script:
-    - echo "{\"auths\":{\"registry.kszk.bme.hu\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - echo " /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $REGISTRY/$CONTAINER_IMAGE"
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $REGISTRY/$CONTAINER_IMAGE
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"$DOCKERHUB_USER\",\"password\":\"$DOCKERHUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --force --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination blintmester/$CONTAINER_IMAGE
+  needs:
+    - go_build
   rules:
     - if: $CI_COMMIT_TAG
       changes:
@@ -92,6 +65,35 @@ docker:
         - go.mod
         - Dockerfile
 
+#docker:
+#  stage: docker-build
+#  tags: [kszk]
+#  needs:
+#    - go_build
+#    - format
+#  image:
+#    name: gcr.io/kaniko-project/executor:debug
+#    entrypoint: [""]
+#  script:
+#    - echo "{\"auths\":{\"registry.kszk.bme.hu\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+#    - echo " /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $REGISTRY/$CONTAINER_IMAGE"
+#    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $REGISTRY/$CONTAINER_IMAGE
+#  rules:
+#    - if: $CI_COMMIT_TAG
+#      changes:
+#        - admin/*
+#        - auth/*
+#        - db/*
+#        - error/*
+#        - helpers/*
+#        - history/*
+#        - homepage/*
+#        - k8s/*
+#        - topup/*
+#        - main.go
+#        - go.mod
+#        - Dockerfile
+
 Upgrade helm:
   stage: deploy
   image:
diff --git a/k8s/templates/deployment.yml b/k8s/templates/deployment.yml
index c83ef58..88528a5 100644
--- a/k8s/templates/deployment.yml
+++ b/k8s/templates/deployment.yml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: becskasszasch
-          image: "registry.kszk.bme.hu/kszk/devteam/becskasszasch:{{ .Values.Tag }}"
+          image: "docker.io/blintmester/becskasszasch:{{ .Values.Tag }}"
           args:
             - -logSQL
           ports:
@@ -36,5 +36,5 @@ spec:
             initialDelaySeconds: 60
             failureThreshold: 3
             periodSeconds: 60
-      imagePullSecrets:
-        - name: devteam-nexus-login
+{{/*      imagePullSecrets:*/}}
+{{/*        - name: devteam-nexus-login*/}}
diff --git a/k8s/templates/secret.yml b/k8s/templates/secret.yml
index ecbd396..8865db8 100644
--- a/k8s/templates/secret.yml
+++ b/k8s/templates/secret.yml
@@ -10,12 +10,12 @@ stringData:
   POSTGRES_USER: "{{ .Values.POSTGRES_USER }}"
   POSTGRES_DB: "{{ .Values.POSTGRES_DB }}"
 
----
-apiVersion: v1
-data:
-  .dockerconfigjson: "{{ .Values.REGISTRY_CONF }}"
-kind: Secret
-metadata:
-  name: devteam-nexus-login
-  namespace: apps
-type: kubernetes.io/dockerconfigjson
\ No newline at end of file
+{{/*---*/}}
+{{/*apiVersion: v1*/}}
+{{/*data:*/}}
+{{/*  .dockerconfigjson: "{{ .Values.REGISTRY_CONF }}"*/}}
+{{/*kind: Secret*/}}
+{{/*metadata:*/}}
+{{/*  name: devteam-nexus-login*/}}
+{{/*  namespace: apps*/}}
+{{/*type: kubernetes.io/dockerconfigjson*/}}
\ No newline at end of file
diff --git a/k8s/values.yaml b/k8s/values.yaml
index eb77203..d93e54f 100644
--- a/k8s/values.yaml
+++ b/k8s/values.yaml
@@ -7,5 +7,5 @@ POSTGRES: "${POSTGRES}"
 POSTGRES_PASS: "${POSTGRES_PASS}"
 POSTGRES_USER: "${POSTGRES_USER}"
 POSTGRES_DB: "${POSTGRES_DB}"
-Tag: "v1.6.6"
+Tag: "v1.6.7"
 REGISTRY_CONF: "${REGISTRY_CONF}"
-- 
GitLab