From f72e2dec4ad8e113b7c32db5ada15dcd915c5c9e Mon Sep 17 00:00:00 2001 From: Felipe Martin <812088+fmartingr@users.noreply.github.com> Date: Sat, 30 Dec 2023 08:03:10 +0100 Subject: [PATCH] deps: updated docker image versions (#809) * deps: updated docker image versions * use dockerhub alpine image * use alpine image from dockerhub in ci --- .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..679f32afc 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 docker.io/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..2153baf6d 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 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 \ 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