From 0c9152370a6748d3b11ed8d10c71985983800a1c Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Fri, 29 Dec 2023 23:35:29 +0100 Subject: [PATCH 1/3] deps: updated docker image versions --- .github/workflows/docker/Dockerfile.ci | 2 +- Dockerfile | 4 ++-- Dockerfile.compose | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker/Dockerfile.ci b/.github/workflows/docker/Dockerfile.ci index 31c206aff..5f1d8162f 100644 --- a/.github/workflows/docker/Dockerfile.ci +++ b/.github/workflows/docker/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM ghcr.io/ghcri/alpine:3.15 +FROM ghcr.io/ghcri/alpine:3.19 ARG TARGETARCH LABEL org.opencontainers.image.source https://github.com/go-shiori/shiori COPY etc /etc diff --git a/Dockerfile b/Dockerfile index 09f640d95..fe12e3477 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # build stage -FROM ghcr.io/ghcri/golang:1.19-alpine3.16 AS builder +FROM ghcr.io/ghcri/golang:1.21-alpine3.19 AS builder WORKDIR /src COPY . . RUN go build -ldflags '-s -w' # server image -FROM ghcr.io/ghcri/alpine:3.16 +FROM ghcr.io/ghcri/alpine:3.19 LABEL org.opencontainers.image.source https://github.com/go-shiori/shiori COPY --from=builder /src/shiori /usr/bin/ RUN addgroup -g 1000 shiori \ diff --git a/Dockerfile.compose b/Dockerfile.compose index f6d077cc2..049ffee01 100644 --- a/Dockerfile.compose +++ b/Dockerfile.compose @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.19-alpine3.16 +FROM docker.io/golang:1.21-alpine3.19 WORKDIR /src/shiori From f2c0655ca989dc8af5900aa1aff8fb2528e7754b Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Sat, 30 Dec 2023 00:39:12 +0100 Subject: [PATCH 2/3] use dockerhub alpine image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fe12e3477..2153baf6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN go build -ldflags '-s -w' # server image -FROM ghcr.io/ghcri/alpine:3.19 +FROM docker.io/alpine:3.19 LABEL org.opencontainers.image.source https://github.com/go-shiori/shiori COPY --from=builder /src/shiori /usr/bin/ RUN addgroup -g 1000 shiori \ From 0c01a70a30fff0853735b30ba62097fbeb343e18 Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Sat, 30 Dec 2023 00:45:56 +0100 Subject: [PATCH 3/3] use alpine image from dockerhub in ci --- .github/workflows/docker/Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker/Dockerfile.ci b/.github/workflows/docker/Dockerfile.ci index 5f1d8162f..679f32afc 100644 --- a/.github/workflows/docker/Dockerfile.ci +++ b/.github/workflows/docker/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM ghcr.io/ghcri/alpine:3.19 +FROM docker.io/alpine:3.19 ARG TARGETARCH LABEL org.opencontainers.image.source https://github.com/go-shiori/shiori COPY etc /etc