Skip to content

Commit

Permalink
fixup docker CI
Browse files Browse the repository at this point in the history
  • Loading branch information
pldubouilh committed Aug 30, 2024
1 parent c963d17 commit cc703cd
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 72 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/always.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

28 changes: 11 additions & 17 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

- name: Set up Docker Buildx
uses: docker/[email protected]
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
Expand All @@ -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 }}
39 changes: 0 additions & 39 deletions .github/workflows/rc.yml

This file was deleted.

7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions support/build.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down

0 comments on commit cc703cd

Please sign in to comment.