From b86d6eee9fe368fc3160fb01a59dec335914eb01 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Fri, 18 Dec 2020 13:28:34 +0700 Subject: [PATCH] Add armv7 and armv6 --- .github/workflows/docker.yml | 2 +- Dockerfile | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 39a7136d..77e39f7b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -67,7 +67,7 @@ jobs: if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} uses: docker/build-push-action@v2 with: - platforms: linux/amd64 + platforms: linux/amd64,linux/arm/v7,linux/arm/v6 push: true file: Dockerfile tags: ${{ steps.tags.outputs.TAGS }} diff --git a/Dockerfile b/Dockerfile index 508519cc..2a80221a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,9 @@ ################################# ## SETUP ## ################################# +# This is the generic base for # +# all other dockers to follow # +################################# FROM docker.io/alpine:edge AS setup ARG TARGETPLATFORM @@ -21,6 +24,9 @@ RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing libg ################################# ## BUILD ## ################################# +# Install dev packages and # +# with cargo # +################################# FROM setup AS build ARG TARGETPLATFORM @@ -46,7 +52,9 @@ RUN cargo build --release ################################# ## PUBLISH ## ################################# -# Create the release container. Match the base OS used to build +# Copy from build neolink and # +# prepares for execution # +################################# FROM setup ARG TARGETPLATFORM ARG REPO