Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: updated docker image versions #809

Merged
merged 4 commits into from
Dec 30, 2023
Merged

deps: updated docker image versions #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c91523
deps: updated docker image versions
fmartingr Dec 29, 2023
f2c0655
use dockerhub alpine image
fmartingr Dec 29, 2023
0c01a70
use alpine image from dockerhub in ci
fmartingr Dec 29, 2023
2525d47
Merge branch 'master' into update-docker-deps
fmartingr Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.compose
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/golang:1.19-alpine3.16
FROM docker.io/golang:1.21-alpine3.19

WORKDIR /src/shiori

Expand Down