diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e408d6648fd66798d3b186ff21ba9d4305da9afc..bf066b556b3fa5cca113ed6088714494c00603ba 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 c83ef58d650ef9690b684a57ccdea4c4a29a12bd..88528a56f9c25db63ef57d881986f0e9c57d829f 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 ecbd396f6afd6d2feddeb874f99cc88563aa2ae5..8865db86c80a4c9b148d08dc81ea01eecb8d6936 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 eb77203a0b6d67e04bf9c5b7de61987139f32384..d93e54fa9b7ef38a943e843952ca15b9a0a5343e 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}"