From d382f6a46ea8f6df22bcff10d74d7ecf1ef66756 Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Sun, 11 Jan 2026 13:33:54 -0600 Subject: [PATCH] update gitlab ci --- .gitlab-ci.yml | 24 ++++++++++++------------ k8s/deployment.yaml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0265ea76..fdf93765 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,8 @@ workflow: build: stage: build interruptible: true - tags: - - gitlabrunner + # tags: + # - gitlabrunner image: docker:27 services: - docker:27-dind @@ -25,12 +25,12 @@ build: - docker pull $CI_REGISTRY_IMAGE:latest || true # Build with cache-from for faster builds and inline cache for future builds - docker build - --cache-from $CI_REGISTRY_IMAGE:latest - --build-arg BUILDKIT_INLINE_CACHE=1 - -f k8s/Dockerfile - -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - -t $CI_REGISTRY_IMAGE:latest - . + --cache-from $CI_REGISTRY_IMAGE:latest + --build-arg BUILDKIT_INLINE_CACHE=1 + -f k8s/Dockerfile + -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + -t $CI_REGISTRY_IMAGE:latest + . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker push $CI_REGISTRY_IMAGE:latest rules: @@ -39,14 +39,14 @@ build: deploy: stage: deploy needs: ["build"] - tags: - - gitlabrunner + # tags: + # - gitlabrunner image: name: bitnami/kubectl:latest - entrypoint: [''] + entrypoint: [""] script: - kubectl config get-contexts - - kubectl config use-context graham/towerops:towerops + - kubectl config use-context towerops/towerops:towerops # Deploy new version (migrations run on app start) - kubectl set image deployment/towerops towerops=$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -n towerops - kubectl rollout status deployment/towerops -n towerops --timeout=5m diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index 1514cec9..5820826f 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -24,7 +24,7 @@ spec: type: RuntimeDefault containers: - name: towerops - image: registry.gitlab.com/graham/towerops:latest + image: registry.gitlab.com/towerops/towerops:latest imagePullPolicy: Always securityContext: allowPrivilegeEscalation: false