From cc703cd70dd1844720af5bbe10b526a6e4d101de Mon Sep 17 00:00:00 2001
From: Pierre Dubouilh <pldubouilh@gmail.com>
Date: Fri, 30 Aug 2024 16:03:39 +0200
Subject: [PATCH] fixup docker CI

---
 .github/workflows/always.yml | 13 ++++--------
 .github/workflows/deploy.yml | 28 ++++++++++----------------
 .github/workflows/rc.yml     | 39 ------------------------------------
 Makefile                     |  7 ++-----
 support/build.Dockerfile     |  5 +++--
 5 files changed, 20 insertions(+), 72 deletions(-)
 delete mode 100644 .github/workflows/rc.yml

diff --git a/.github/workflows/always.yml b/.github/workflows/always.yml
index 59861b1..17fc8c6 100644
--- a/.github/workflows/always.yml
+++ b/.github/workflows/always.yml
@@ -6,20 +6,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Checkout code
+      uses: actions/checkout@v4
+
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v5
       with:
         go-version: 1.23.0
       id: go
 
-    - name: deps
-      run: npm i -g standard
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-
     - name: Run
       run: make ci
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index cf90c64..fbe3c9b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,33 +10,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.23.0
-      id: go
+      uses: actions/checkout@v4
 
     - name: Set env
       run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1.2.0
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1.6.0
+      uses: docker/setup-qemu-action@v3
 
     - name: Login to DockerHub
-      uses: docker/login-action@v1.10.0
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Build and release on dockerhub
-      uses: docker/build-push-action@v2.7.0
+      uses: docker/build-push-action@v6
       with:
         file: support/build.Dockerfile
         push: true
@@ -47,17 +39,19 @@ jobs:
       run: make build-all
 
     - name: "Release gh release versioned"
-      uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
+      uses: ncipollo/release-action@v1
       with:
         allowUpdates: true
         artifacts: "builds/*"
+        bodyFile: "builds/buildout"
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: "Release gh release latest"
-      uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
+      uses: ncipollo/release-action@v1
       with:
         tag: latest
         name: Latest
         allowUpdates: true
         artifacts: "builds/*"
+        bodyFile: "builds/buildout"
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
deleted file mode 100644
index b1a9cfd..0000000
--- a/.github/workflows/rc.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: rc
-
-on:
-  push:
-    branches:
-      - 'rc/**'
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.23.0
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-      with:
-        submodules: true
-
-    - name: Run
-      run: make ci
-
-    - name: Build all artifacts
-      run: make build-all
-
-    - name: "Release gh release prerelease"
-      uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
-      with:
-        allowUpdates: true
-        prerelease: true
-        tag: "rc"
-        artifacts: "builds/*"
-        token: ${{ secrets.GITHUB_TOKEN }}
-
diff --git a/Makefile b/Makefile
index 8685c33..760d4f8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,7 @@ run-ro::
 run-extra::
 	./gossa -verb=true -prefix="/fancy-path/" -k=false -symlinks=true test-fixture
 
-lint-js::
-	standard
-
-ci:: build-all test lint-js
+ci:: build-all test
 	echo "done"
 
 test::
@@ -66,7 +63,7 @@ build-all:: build
 	${NOCGO} GOOS=darwin  GOARCH=amd64 go build ${FLAGS} -o builds/gossa-mac-x64
 	${NOCGO} GOOS=darwin  GOARCH=arm64 go build ${FLAGS} -o builds/gossa-mac-arm64
 	${NOCGO} GOOS=windows GOARCH=amd64 go build ${FLAGS} -o builds/gossa-windows.exe
-	sha256sum builds/*
+	sha256sum builds/* | tee builds/buildout
 
 clean::
 	rm -f gossa
diff --git a/support/build.Dockerfile b/support/build.Dockerfile
index 8883d9c..b2e6180 100644
--- a/support/build.Dockerfile
+++ b/support/build.Dockerfile
@@ -1,9 +1,10 @@
-FROM golang:1.23.0 AS builder
+FROM golang:1.23.0-alpine AS builder
+RUN apk add --no-cache make
 WORKDIR /gossaSrc
 COPY . /gossaSrc
 RUN make
 
-FROM docker.io/library/alpine:3.20
+FROM alpine:3.20
 ENV UID="1000" GID="1000" HOST="0.0.0.0" PORT="8001" PREFIX="/" FOLLOW_SYMLINKS="false" SKIP_HIDDEN_FILES="true" DATADIR="/shared" READONLY="false" VERB="false"
 COPY --from=builder /gossaSrc/gossa /gossa
 RUN addgroup -g ${GID} user \