Skip to content

Commit cc703cd

Browse files
committed
fixup docker CI
1 parent c963d17 commit cc703cd

File tree

5 files changed

+20
-72
lines changed

5 files changed

+20
-72
lines changed

.github/workflows/always.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,15 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88

9+
- name: Checkout code
10+
uses: actions/checkout@v4
11+
912
- name: Set up Go
10-
uses: actions/setup-go@v1
13+
uses: actions/setup-go@v5
1114
with:
1215
go-version: 1.23.0
1316
id: go
1417

15-
- name: deps
16-
run: npm i -g standard
17-
18-
- name: Check out code into the Go module directory
19-
uses: actions/checkout@v1
20-
with:
21-
submodules: true
22-
2318
- name: Run
2419
run: make ci
2520

.github/workflows/deploy.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,25 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v1
14-
with:
15-
submodules: true
16-
17-
- name: Set up Go
18-
uses: actions/setup-go@v1
19-
with:
20-
go-version: 1.23.0
21-
id: go
13+
uses: actions/checkout@v4
2214

2315
- name: Set env
2416
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
2517

2618
- name: Set up QEMU
27-
uses: docker/[email protected]
28-
29-
- name: Set up Docker Buildx
30-
uses: docker/[email protected]
19+
uses: docker/setup-qemu-action@v3
3120

3221
- name: Login to DockerHub
33-
uses: docker/login-action@v1.10.0
22+
uses: docker/login-action@v3
3423
with:
3524
username: ${{ secrets.DOCKER_USER }}
3625
password: ${{ secrets.DOCKER_PASSWORD }}
3726

27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v3
29+
3830
- name: Build and release on dockerhub
39-
uses: docker/build-push-action@v2.7.0
31+
uses: docker/build-push-action@v6
4032
with:
4133
file: support/build.Dockerfile
4234
push: true
@@ -47,17 +39,19 @@ jobs:
4739
run: make build-all
4840

4941
- name: "Release gh release versioned"
50-
uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
42+
uses: ncipollo/release-action@v1
5143
with:
5244
allowUpdates: true
5345
artifacts: "builds/*"
46+
bodyFile: "builds/buildout"
5447
token: ${{ secrets.GITHUB_TOKEN }}
5548

5649
- name: "Release gh release latest"
57-
uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
50+
uses: ncipollo/release-action@v1
5851
with:
5952
tag: latest
6053
name: Latest
6154
allowUpdates: true
6255
artifacts: "builds/*"
56+
bodyFile: "builds/buildout"
6357
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rc.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ run-ro::
1717
run-extra::
1818
./gossa -verb=true -prefix="/fancy-path/" -k=false -symlinks=true test-fixture
1919

20-
lint-js::
21-
standard
22-
23-
ci:: build-all test lint-js
20+
ci:: build-all test
2421
echo "done"
2522

2623
test::
@@ -66,7 +63,7 @@ build-all:: build
6663
${NOCGO} GOOS=darwin GOARCH=amd64 go build ${FLAGS} -o builds/gossa-mac-x64
6764
${NOCGO} GOOS=darwin GOARCH=arm64 go build ${FLAGS} -o builds/gossa-mac-arm64
6865
${NOCGO} GOOS=windows GOARCH=amd64 go build ${FLAGS} -o builds/gossa-windows.exe
69-
sha256sum builds/*
66+
sha256sum builds/* | tee builds/buildout
7067

7168
clean::
7269
rm -f gossa

support/build.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
FROM golang:1.23.0 AS builder
1+
FROM golang:1.23.0-alpine AS builder
2+
RUN apk add --no-cache make
23
WORKDIR /gossaSrc
34
COPY . /gossaSrc
45
RUN make
56

6-
FROM docker.io/library/alpine:3.20
7+
FROM alpine:3.20
78
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"
89
COPY --from=builder /gossaSrc/gossa /gossa
910
RUN addgroup -g ${GID} user \

0 commit comments

Comments
 (0)