From e53ceaa3e36c49ccb0c28d7a03b60158cb90ee19 Mon Sep 17 00:00:00 2001 From: Paramtamtam Date: Tue, 23 Mar 2021 15:08:46 +0500 Subject: [PATCH] Revert "Docker image arch linux/arm/v7 added" This reverts commit 8c5b04a0df9a375a741994bd222956f68f4ea8a4. --- .github/workflows/release.yml | 19 ++++++++----------- CHANGELOG.md | 6 ------ Dockerfile | 6 ++---- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4072fde..03a7b4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,12 +12,6 @@ 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 @@ -30,12 +24,15 @@ jobs: - name: Build image run: | - docker buildx build \ - --platform "linux/amd64,linux/arm/v7" \ + docker build \ --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" \ - --file ./Dockerfile \ - --push \ - . + -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" diff --git a/CHANGELOG.md b/CHANGELOG.md index 41d1ce9..f3f7550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,6 @@ 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 4529bc9..1ce6127 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ -# syntax=docker/dockerfile:1.2 - # Image page: -FROM --platform=${TARGETPLATFORM:-linux/amd64} gcc:10.2.0 as builder +FROM gcc:10.2.0 as builder # e.g.: `docker build --build-arg "VERSION=0.9.3" .` ARG VERSION="0.9.3" @@ -36,7 +34,7 @@ RUN set -x \ && strip ./bin/SSLPlugin.ld.so # Prepare filesystem for 3proxy running -FROM --platform=${TARGETPLATFORM:-linux/amd64} busybox:1.32-glibc as buffer +FROM busybox:1.32-glibc as buffer # Copy binaries COPY --from=builder /lib/x86_64-linux-gnu/libdl.so.* /lib/