Merge branch 'tormakris-master-patch-23908' into 'master'

jolesz most eskü

See merge request !6

.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

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