Revert "Docker image arch linux/arm/v7 added"
This reverts commit 8c5b04a0df9a375a741994bd222956f68f4ea8a4.
This commit is contained in:
parent
8c5b04a0df
commit
e53ceaa3e3
19
.github/workflows/release.yml
vendored
19
.github/workflows/release.yml
vendored
@ -12,12 +12,6 @@ jobs:
|
|||||||
- name: Check out code
|
- name: Check out code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v1 # Action page: <https://github.com/docker/setup-qemu-action>
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v1 # Action page: <https://github.com/docker/setup-buildx-action>
|
|
||||||
|
|
||||||
- name: Docker login in default registry
|
- name: Docker login in default registry
|
||||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin &> /dev/null
|
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin &> /dev/null
|
||||||
|
|
||||||
@ -30,12 +24,15 @@ jobs:
|
|||||||
|
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: |
|
run: |
|
||||||
docker buildx build \
|
docker build \
|
||||||
--platform "linux/amd64,linux/arm/v7" \
|
|
||||||
--tag "tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
--tag "tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
||||||
--tag "tarampampam/3proxy:latest" \
|
--tag "tarampampam/3proxy:latest" \
|
||||||
--tag "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
--tag "ghcr.io/tarampampam/3proxy:${{ steps.tag.outputs.value }}" \
|
||||||
--tag "ghcr.io/tarampampam/3proxy:latest" \
|
--tag "ghcr.io/tarampampam/3proxy:latest" \
|
||||||
--file ./Dockerfile \
|
-f ./Dockerfile .
|
||||||
--push \
|
|
||||||
.
|
- 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"
|
||||||
|
@ -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].
|
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
|
## v1.2.0
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
# syntax=docker/dockerfile:1.2
|
|
||||||
|
|
||||||
# Image page: <https://hub.docker.com/_/gcc>
|
# Image page: <https://hub.docker.com/_/gcc>
|
||||||
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" .`
|
# e.g.: `docker build --build-arg "VERSION=0.9.3" .`
|
||||||
ARG VERSION="0.9.3"
|
ARG VERSION="0.9.3"
|
||||||
@ -36,7 +34,7 @@ RUN set -x \
|
|||||||
&& strip ./bin/SSLPlugin.ld.so
|
&& strip ./bin/SSLPlugin.ld.so
|
||||||
|
|
||||||
# Prepare filesystem for 3proxy running
|
# 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 binaries
|
||||||
COPY --from=builder /lib/x86_64-linux-gnu/libdl.so.* /lib/
|
COPY --from=builder /lib/x86_64-linux-gnu/libdl.so.* /lib/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user