chore(build): switch to alpine as build image (#295)

bakito · Feb 15, 2025 · 34c7115 · 34c7115
1 parent 43773ba
commit 34c7115
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
@@ -10,6 +10,10 @@ on:
   schedule:
     - cron: '32 0 * * 4'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
@@ -29,7 +33,7 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:

diff --git a/.github/workflows/publish.yaml → .github/workflows/docker-images.yaml b/.github/workflows/publish.yaml → .github/workflows/docker-images.yaml
@@ -4,10 +4,17 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
   release:
     types:
       - published
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   packages: write
 
@@ -33,25 +40,27 @@ jobs:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
-      - name: Build and push ${{github.event.release.tag_name }}
+      - name: Build images ${{github.event.release.tag_name }}
         id: docker_build_release
         uses: docker/build-push-action@v6
         if: ${{ github.event.release.tag_name != '' }}
         with:
           push: true
+          pull: true
           tags: ghcr.io/bakito/sealed-secrets-web:latest,ghcr.io/bakito/sealed-secrets-web:${{ github.event.release.tag_name }},quay.io/bakito/sealed-secrets-web:latest,quay.io/bakito/sealed-secrets-web:${{ github.event.release.tag_name }}
           platforms: linux/amd64,linux/arm64
           provenance: false
           build-args: |
             VERSION=${{ github.event.release.tag_name }}
             BUILD=${{ env.curr_date }}
 
-      - name: Build and push main
+      - name: Build images
         id: docker_build_main
         uses: docker/build-push-action@v6
         if: ${{ github.event.release.tag_name == '' }}
         with:
-          push: true
+          push: ${{ github.ref == 'refs/heads/main' }}
+          pull: true
           tags: ghcr.io/bakito/sealed-secrets-web:main,quay.io/bakito/sealed-secrets-web:main
           platforms: linux/amd64,linux/arm64
           provenance: false

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -8,6 +8,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   e2e:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-code.yaml b/.github/workflows/test-code.yaml
@@ -7,6 +7,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   go:
     name: Go Tests

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM golang:1.23-bullseye AS builder
+FROM golang:1.24-alpine AS builder
 WORKDIR /go/src/app
 
-RUN apt-get update && apt-get install -y upx curl
+RUN apk update && apk add upx
 
 ARG VERSION=main
 ARG BUILD="N/A"

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/bakito/sealed-secrets-web
 
-go 1.23.4
+go 1.24.0
 
 require (
 	github.com/bitnami-labs/sealed-secrets v0.28.0