From f199d2ebe81303404301e367834244836116b3c6 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 20 Mar 2025 17:18:28 +0100 Subject: [PATCH 1/4] fixes host and path in deployment.yaml --- deployment/{deployment.yml => deployment.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename deployment/{deployment.yml => deployment.yaml} (92%) diff --git a/deployment/deployment.yml b/deployment/deployment.yaml similarity index 92% rename from deployment/deployment.yml rename to deployment/deployment.yaml index 7d3e2d5..a3d35d3 100644 --- a/deployment/deployment.yml +++ b/deployment/deployment.yaml @@ -44,10 +44,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "false" spec: rules: - - host: ascii.live + - host: {{{ .Env.DOMAIN }}} http: paths: - - path: / + - path: /ascii-live pathType: Prefix backend: service: @@ -57,4 +57,4 @@ spec: tls: - secretName: ascii-live-tls-prod-cert hosts: - - ascii.live + - {{{ .Env.DOMAIN }}} -- 2.45.2 From b3258aa5b61b78288391b6012031b5ab682705b4 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 20 Mar 2025 17:38:55 +0100 Subject: [PATCH 2/4] fixes host and path in deployment.yaml --- deployment/deployment.yaml | 4 ++-- main.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/deployment.yaml b/deployment/deployment.yaml index a3d35d3..0ee8de3 100644 --- a/deployment/deployment.yaml +++ b/deployment/deployment.yaml @@ -44,7 +44,7 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "false" spec: rules: - - host: {{{ .Env.DOMAIN }}} + - host: 192-168-197-2.traefik.me http: paths: - path: /ascii-live @@ -57,4 +57,4 @@ spec: tls: - secretName: ascii-live-tls-prod-cert hosts: - - {{{ .Env.DOMAIN }}} + - 192-168-197-2.traefik.me diff --git a/main.go b/main.go index 8c91468..457d226 100644 --- a/main.go +++ b/main.go @@ -110,8 +110,8 @@ func main() { flag.Set("logtostderr", "true") r := mux.NewRouter() - r.HandleFunc("/list", listHandler).Methods("GET") - r.HandleFunc("/{frameSource}", handler).Methods("GET") + r.HandleFunc("/ascii-live/list", listHandler).Methods("GET") + r.HandleFunc("/ascii-live/{frameSource}", handler).Methods("GET") r.NotFoundHandler = http.HandlerFunc(notFoundHandler) srv := &http.Server{ -- 2.45.2 From 1653919a5183d1d30d96a2e444538c66f77d569e Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 20 Mar 2025 18:15:17 +0100 Subject: [PATCH 3/4] workflow test --- .github/workflows/.github-ci.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/.github-ci.yml b/.github/workflows/.github-ci.yml index 1d686fd..d7705da 100644 --- a/.github/workflows/.github-ci.yml +++ b/.github/workflows/.github-ci.yml @@ -7,8 +7,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - - name: Repository meta + - name: Repository meta id: repository run: | registry=${{ github.server_url }} @@ -18,30 +17,30 @@ jobs: repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')" echo "repository=${repository}" >> "$GITHUB_OUTPUT" echo "repository=${repository}" - - - name: Docker meta + + - name: Docker meta uses: docker/metadata-action@v5 id: docker with: images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }} - - - name: Login to registry + + - name: Login to registry uses: docker/login-action@v3 with: registry: ${{ steps.repository.outputs.registry }} username: ${{ secrets.PACKAGES_USER }} password: ${{ secrets.PACKAGES_TOKEN }} - - - name: Set up QEMU + + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx + + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: buildkitd-flags: '--allow-insecure-entitlement network.host' driver-opts: network=host - - - name: Build and push + + - name: Build and push uses: docker/build-push-action@v6 with: push: true -- 2.45.2 From a2cbefffd4ba502158d26f4295f4357c58df4bfa Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 20 Mar 2025 18:36:23 +0100 Subject: [PATCH 4/4] adds self-built image in deployment.yaml --- deployment/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/deployment.yaml b/deployment/deployment.yaml index 0ee8de3..c1037eb 100644 --- a/deployment/deployment.yaml +++ b/deployment/deployment.yaml @@ -13,7 +13,7 @@ spec: app: ascii-live spec: containers: - - image: hugomd/ascii-live:407342dc + - image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/franz.germann/ascii-live:development name: ascii-live ports: - containerPort: 8080 -- 2.45.2