Liu Song’s Projects


~/Projects/miniflux

git clone https://code.lsong.org/miniflux

Commit

Commit
30288fec8d2de611be254ac9a3c09ae54408f0f6
Author
Frédéric Guillot <[email protected]>
Date
2023-06-22 20:54:30 -0700 -0700
Diffstat
 .github/workflows/docker.yml | 29 +++++++++++++++++++++++++++
 packaging/docker/alpine/Dockerfile | 2 +
 packaging/docker/distroless/Dockerfile | 2 +

Disable CGO when building Docker images


diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7eb03e2c2f0a19ef2fab81ce0de00084ae411b57..c665d24740d6fb1a2bf0cdd020747748db5b9f3d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,8 +5,37 @@     - cron: '0 1 * * *'
   push:
     tags:
       - '*.*.*'
+  pull_request:
+    branches: [ main ]
 jobs:
+  test-docker-images:
+    tags:
   docker-images:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build Alpine image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./packaging/docker/alpine/Dockerfile
+          push: false
+          tags: ${{ github.repository_owner }}/miniflux:alpine-dev
+      - name: Test Alpine Docker image
+        run: docker run --rm ${{ github.repository_owner }}/miniflux:alpine-dev miniflux -i
+      - name: Build Distroless image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./packaging/docker/distroless/Dockerfile
+          push: false
+          tags: ${{ github.repository_owner }}/miniflux:distroless-dev
+      - name: Test Distroless Docker image
+        run: docker run --rm ${{ github.repository_owner }}/miniflux:distroless-dev miniflux -i
+
+  publish-docker-images:
+    if: ${{ ! github.event.pull_request }}
     permissions:
       packages: write
     runs-on: ubuntu-latest




diff --git a/packaging/docker/alpine/Dockerfile b/packaging/docker/alpine/Dockerfile
index fdb9c9c6f44d967c3718b7387bb2273708914858..a8727624c574d0e1a000916396b4fc14336329dd 100644
--- a/packaging/docker/alpine/Dockerfile
+++ b/packaging/docker/alpine/Dockerfile
@@ -1,5 +1,7 @@
 FROM golang:alpine AS build
 RUN apk add --no-cache --update git
+WORKDIR /go/src/app
+RUN apk add --no-cache --update git
 ADD . /go/src/app
 WORKDIR /go/src/app
 RUN go build \




diff --git a/packaging/docker/distroless/Dockerfile b/packaging/docker/distroless/Dockerfile
index 9e28b0df64c49eee3b1a6736d21f5f45d4410368..c6c0a0efa2181e17f834ef4210ce03a5023447a0 100644
--- a/packaging/docker/distroless/Dockerfile
+++ b/packaging/docker/distroless/Dockerfile
@@ -1,5 +1,7 @@
 FROM golang:latest AS build
 ADD . /go/src/app
+ADD . /go/src/app
+ADD . /go/src/app
 WORKDIR /go/src/app
 RUN go build \
     -o miniflux \