From 8c5b04a0df9a375a741994bd222956f68f4ea8a4 Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Tue, 23 Mar 2021 15:08:46 +0500 Subject: [PATCH] Docker image arch linux/arm/v7 added --- .github/workflows/release.yml | 19 +++++++++++-------- CHANGELOG.md | 6 ++++++ Dockerfile | 6 ++++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03a7b4d..4072fde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,12 @@ jobs: - name: Check out code uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 # Action page: + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 # Action page: + - name: Docker login in default registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin &> /dev/null @@ -24,15 +30,12 @@ jobs: - name: Build image run: | - docker build \ + docker buildx build \ + --platform "linux/amd64,linux/arm/v7" \ --tag "tarampampam/3proxy:${{ steps.tag.outputs.value }}" \ --tag "tarampampam/3proxy:latest" \ --tag "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" \ --tag "ghcr.io/tarampampam/3proxy:latest" \ - -f ./Dockerfile . - - - name: Push into default registry - run: docker push "tarampampam/3proxy:${{ steps.tag.outputs.value }}" && docker push "tarampampam/3proxy:latest" - - - name: Push into ghcr.io - run: docker push "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" && docker push "ghcr.io/tarampampam/3proxy:latest" + --file ./Dockerfile \ + --push \ + . diff --git a/CHANGELOG.md b/CHANGELOG.md index f3f7550..41d1ce9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## v1.3.0 + +### Added + +- Support for `linux/arm/v7` platform for docker image + ## v1.2.0 ### Changed diff --git a/Dockerfile b/Dockerfile index 1ce6127..4529bc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ +# syntax=docker/dockerfile:1.2 + # Image page: -FROM gcc:10.2.0 as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} gcc:10.2.0 as builder # e.g.: `docker build --build-arg "VERSION=0.9.3" .` ARG VERSION="0.9.3" @@ -34,7 +36,7 @@ RUN set -x \ && strip ./bin/SSLPlugin.ld.so # Prepare filesystem for 3proxy running -FROM busybox:1.32-glibc as buffer +FROM --platform=${TARGETPLATFORM:-linux/amd64} busybox:1.32-glibc as buffer # Copy binaries COPY --from=builder /lib/x86_64-linux-gnu/libdl.so.* /lib/