mirror of
https://github.com/writefreely/writefreely
synced 2024-11-10 03:24:11 +00:00
Merge pull request #933 from CDN18/develop
Add linux/arm64 platform support for docker
This commit is contained in:
commit
226bb14716
2 changed files with 11 additions and 4 deletions
9
.github/workflows/docker-publish.yml
vendored
9
.github/workflows/docker-publish.yml
vendored
|
@ -30,6 +30,14 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Set up QEMU for cross-building
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3.0.0
|
||||
|
||||
# Set up Docker Buildx
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3.0.0
|
||||
|
||||
# Login against a Docker registry except on PR
|
||||
# https://github.com/docker/login-action
|
||||
- name: Log into registry ${{ env.REGISTRY }}
|
||||
|
@ -56,6 +64,7 @@ jobs:
|
|||
uses: docker/build-push-action@v5.0.0
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# Build image
|
||||
# SHA256 of golang:1.21-alpine3.18 linux/amd64
|
||||
FROM golang@sha256:f475434ea2047a83e9ba02a1da8efc250fa6b2ed0e9e8e4eb8c5322ea6997795 as build
|
||||
FROM golang:1.21-alpine3.18 as build
|
||||
|
||||
LABEL org.opencontainers.image.source="https://github.com/writefreely/writefreely"
|
||||
LABEL org.opencontainers.image.description="WriteFreely is a clean, minimalist publishing platform made for writers. Start a blog, share knowledge within your organization, or build a community around the shared act of writing."
|
||||
|
@ -31,8 +30,7 @@ RUN make build \
|
|||
/stage
|
||||
|
||||
# Final image
|
||||
# SHA256 of alpine:3.18.4 linux/amd64
|
||||
FROM alpine@sha256:48d9183eb12a05c99bcc0bf44a003607b8e941e1d4f41f9ad12bdcc4b5672f86
|
||||
FROM alpine:3.18.4
|
||||
|
||||
RUN apk -U upgrade \
|
||||
&& apk add --no-cache openssl ca-certificates
|
||||
|
|
Loading…
Reference in a new issue