From 5e94fc4239047f2e11040be703a88f11fb21a770 Mon Sep 17 00:00:00 2001 From: softwarenoob Date: Mon, 23 May 2022 05:17:41 +0300 Subject: [PATCH] fix: multi platform builds --- bot/bastion/Dockerfile | 4 ++-- bot/parkertron/Dockerfile | 2 +- bot/red/Dockerfile | 2 +- bot/sinusbot/Dockerfile | 2 +- cassandra/java11_python3/Dockerfile | 2 +- cassandra/java8_python2/Dockerfile | 2 +- dotnet/2.1/Dockerfile | 2 +- dotnet/3.1/Dockerfile | 2 +- dotnet/5/Dockerfile | 2 +- dotnet/6/Dockerfile | 2 +- erlang/22/Dockerfile | 2 +- erlang/23/Dockerfile | 2 +- erlang/24/Dockerfile | 2 +- games/altv/Dockerfile | 4 ++-- games/samp/Dockerfile | 2 +- games/source/Dockerfile | 2 +- go/1.14/Dockerfile | 2 +- go/1.15/Dockerfile | 2 +- go/1.16/Dockerfile | 2 +- installers/alpine/Dockerfile | 2 +- installers/debian/Dockerfile | 4 ++-- voice/teaspeak/Dockerfile | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bot/bastion/Dockerfile b/bot/bastion/Dockerfile index 18390f3..00d5508 100644 --- a/bot/bastion/Dockerfile +++ b/bot/bastion/Dockerfile @@ -1,7 +1,7 @@ -FROM node:14-buster +FROM --platform=$TARGETOS/$TARGETARCH node:14-buster LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" - ## install mongo +## install mongo RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - \ && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list \ && apt update \ diff --git a/bot/parkertron/Dockerfile b/bot/parkertron/Dockerfile index d87f516..87fc60a 100644 --- a/bot/parkertron/Dockerfile +++ b/bot/parkertron/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM --platform=$TARGETOS/$TARGETARCH alpine:3.9 LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/bot/red/Dockerfile b/bot/red/Dockerfile index 29cf0a9..92f9d98 100644 --- a/bot/red/Dockerfile +++ b/bot/red/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.8-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/bot/sinusbot/Dockerfile b/bot/sinusbot/Dockerfile index bbc4a92..63afc17 100644 --- a/bot/sinusbot/Dockerfile +++ b/bot/sinusbot/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM --platform=$TARGETOS/$TARGETARCH ubuntu:18.04 LABEL maintainer="ki2007 " version="1.0" diff --git a/cassandra/java11_python3/Dockerfile b/cassandra/java11_python3/Dockerfile index 785ad40..4f5ddb3 100644 --- a/cassandra/java11_python3/Dockerfile +++ b/cassandra/java11_python3/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre +FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11:alpine-jre LABEL author="Pascal Zarrad" maintainer="p.zarrad@outlook.de" diff --git a/cassandra/java8_python2/Dockerfile b/cassandra/java8_python2/Dockerfile index 1c8260c..32770f4 100644 --- a/cassandra/java8_python2/Dockerfile +++ b/cassandra/java8_python2/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre +FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8:alpine-jre LABEL author="Pascal Zarrad" maintainer="p.zarrad@outlook.de" diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile index f85a2c4..440f50b 100644 --- a/dotnet/2.1/Dockerfile +++ b/dotnet/2.1/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian +FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile index 1dae74c..f655e82 100644 --- a/dotnet/3.1/Dockerfile +++ b/dotnet/3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian +FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile index 934d73e..2fe9f19 100644 --- a/dotnet/5/Dockerfile +++ b/dotnet/5/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian +FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile index 38307bd..7880a3e 100644 --- a/dotnet/6/Dockerfile +++ b/dotnet/6/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian +FROM --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/erlang/22/Dockerfile b/erlang/22/Dockerfile index ca64333..c391152 100644 --- a/erlang/22/Dockerfile +++ b/erlang/22/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM erlang:22-alpine +FROM --platform=$TARGETOS/$TARGETARCH erlang:22-alpine LABEL author="Pascal Zarrad" maintainer="p.zarrad@outlook.de" diff --git a/erlang/23/Dockerfile b/erlang/23/Dockerfile index 2349293..10d4cd1 100644 --- a/erlang/23/Dockerfile +++ b/erlang/23/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM erlang:23-alpine +FROM --platform=$TARGETOS/$TARGETARCH erlang:23-alpine LABEL author="Pascal Zarrad" maintainer="p.zarrad@outlook.de" diff --git a/erlang/24/Dockerfile b/erlang/24/Dockerfile index fff015f..ea47ef4 100644 --- a/erlang/24/Dockerfile +++ b/erlang/24/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM erlang:24-alpine +FROM --platform=$TARGETOS/$TARGETARCH erlang:24-alpine LABEL author="Pascal Zarrad" maintainer="p.zarrad@outlook.de" diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile index a71b4ca..1126862 100644 --- a/games/altv/Dockerfile +++ b/games/altv/Dockerfile @@ -1,7 +1,7 @@ # ---------------------------------- # Environment: debian # ---------------------------------- -FROM node:16-bullseye +FROM --platform=$TARGETOS/$TARGETARCH node:16-bullseye LABEL author="goover" maintainer="info@goover.de" @@ -19,7 +19,7 @@ RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft- && dpkg -i packages-microsoft-prod.deb \ && apt update -y \ && apt install -y dotnet-sdk-5.0 dotnet-sdk-6.0 libgdiplus - + RUN update-locale lang=en_US.UTF-8 \ && dpkg-reconfigure --frontend noninteractive locales diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile index e1b5ff4..3ed3929 100644 --- a/games/samp/Dockerfile +++ b/games/samp/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim LABEL author="QuintenQVD" maintainer="josdekurk@gmail.com" diff --git a/games/source/Dockerfile b/games/source/Dockerfile index 617a9f6..3af65bd 100644 --- a/games/source/Dockerfile +++ b/games/source/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM debian:stable-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:stable-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/go/1.14/Dockerfile b/go/1.14/Dockerfile index 105e773..285e36b 100644 --- a/go/1.14/Dockerfile +++ b/go/1.14/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM golang:1.14-alpine +FROM --platform=$TARGETOS/$TARGETARCH golang:1.14-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/go/1.15/Dockerfile b/go/1.15/Dockerfile index 50a8531..0279ead 100644 --- a/go/1.15/Dockerfile +++ b/go/1.15/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM golang:1.15-alpine +FROM --platform=$TARGETOS/$TARGETARCH golang:1.15-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/go/1.16/Dockerfile b/go/1.16/Dockerfile index 9855e47..1ab08f3 100644 --- a/go/1.16/Dockerfile +++ b/go/1.16/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM golang:1.16-alpine +FROM --platform=$TARGETOS/$TARGETARCH golang:1.16-alpine LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/installers/alpine/Dockerfile b/installers/alpine/Dockerfile index 0f6b97f..a5b6b81 100644 --- a/installers/alpine/Dockerfile +++ b/installers/alpine/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM alpine:latest +FROM --platform=$TARGETOS/$TARGETARCH alpine:latest LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile index e671c61..25168ba 100644 --- a/installers/debian/Dockerfile +++ b/installers/debian/Dockerfile @@ -18,9 +18,9 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# +# -FROM --platform=$BUILDPLATFORM debian:stable-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:stable-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/voice/teaspeak/Dockerfile b/voice/teaspeak/Dockerfile index 809b228..ffa3d3a 100644 --- a/voice/teaspeak/Dockerfile +++ b/voice/teaspeak/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$BUILDPLATFORM debian:stable-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:stable-slim LABEL author="Torsten Widmann" maintainer="info@goover.de"