Split per platform logic

oxsecurity · Apr 18, 2023 · e271bbe · e271bbe
1 parent 14fb3fc
commit e271bbe
Show file tree

Hide file tree

Showing 132 changed files with 1,442 additions and 264 deletions.
diff --git a/.automation/build.py b/.automation/build.py
@@ -293,6 +293,8 @@ def build_dockerfile(
     is_docker_build_platform_other_run = False
     has_npm_copy = False
     venv_builddeps_command = []
+    venv_builddeps_arm_command = []
+    venv_builddeps_amd_command = []
     venv_apk_builddeps = ["gcc", "libffi-dev", "musl-dev", "make", "curl", "openssl-dev"]
     # Manage docker
     if requires_docker is True:
@@ -455,6 +457,10 @@ def build_dockerfile(
             venv_apk_builddeps += item["install"]["pip_apk"]
         if "pip_builddep" in item["install"]:
             venv_builddeps_command += item["install"]["pip_builddep"]
+        if "pip_builddep_arm" in item["install"]:
+            venv_builddeps_arm_command += item["install"]["pip_builddep_arm"]
+        if "pip_builddep_amd" in item["install"]:
+            venv_builddeps_amd_command += item["install"]["pip_builddep_amd"]
         if "build_platform_apk" in item["install"]:
             apk_build_platform_packages += item["install"]["build_platform_apk"]
         if "npm_apk" in item["install"]:
@@ -666,6 +672,12 @@ def build_dockerfile(
     replace_in_file(
         dockerfile, "#PIPVENV_BUILDDEPS__START", "#PIPVENV_BUILDDEPS__END", "\\n".join(venv_builddeps_command)
     )
+    replace_in_file(
+        dockerfile, "#PIPVENV_BUILDDEPS_AMD__START", "#PIPVENV_BUILDDEPS_AMD__END", "\\n".join(venv_builddeps_amd_command)
+    )
+    replace_in_file(
+        dockerfile, "#PIPVENV_BUILDDEPS_ARM__START", "#PIPVENV_BUILDDEPS_ARM__END", "\\n".join(venv_builddeps_arm_command)
+    )
     replace_in_file(
         dockerfile, "#PIPVENV_PATH__START", "#PIPVENV_PATH__END", pipenv_path_command
     )

diff --git a/Dockerfile b/Dockerfile
@@ -225,7 +225,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -269,14 +269,22 @@ RUN apk add --update --no-cache \
                 openssl-dev \
                 g++ \
                 cmake
-ENV CFLAGS=-mno-outline-atomics
 #PIPVENV_BUILDDEPS__END
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+ENV CFLAGS=-mno-outline-atomics
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile
@@ -134,7 +134,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -147,7 +147,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -157,11 +156,21 @@ RUN apk add --update --no-cache \
                 curl \
                 openssl-dev
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile
@@ -204,7 +204,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -235,7 +235,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -246,13 +245,22 @@ RUN apk add --update --no-cache \
                 openssl-dev \
                 g++ \
                 cmake
-ENV CFLAGS=-mno-outline-atomics
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+ENV CFLAGS=-mno-outline-atomics
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile
@@ -167,7 +167,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -188,7 +188,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -200,11 +199,21 @@ RUN apk add --update --no-cache \
                 g++ \
                 cmake
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile
@@ -170,7 +170,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -192,7 +192,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -204,11 +203,21 @@ RUN apk add --update --no-cache \
                 g++ \
                 cmake
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile
@@ -174,7 +174,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -195,7 +195,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -207,11 +206,21 @@ RUN apk add --update --no-cache \
                 g++ \
                 cmake
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile
@@ -167,7 +167,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -188,7 +188,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -200,11 +199,21 @@ RUN apk add --update --no-cache \
                 g++ \
                 cmake
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile
@@ -186,7 +186,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -207,7 +207,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -219,11 +218,21 @@ RUN apk add --update --no-cache \
                 g++ \
                 cmake
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
 

diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile
@@ -167,7 +167,7 @@ COPY --link --from=cargo /bin/* /usr/bin/
 #COPY__END
 
 FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
-FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
+FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv-base
 
 
 #############################################################################################
@@ -188,7 +188,6 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
 
 #PIPVENV_DOWNLOAD__END
 
-#RUN apk add --update --no-cache cmake g++
 #PIPVENV_BUILDDEPS__START
 RUN apk add --update --no-cache \
                 gcc \
@@ -200,11 +199,21 @@ RUN apk add --update --no-cache \
                 g++ \
                 cmake
 #PIPVENV_BUILDDEPS__END
+
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable
 ENV PATH=${PATH}:/root/.cargo/bin
 
 RUN mkdir /venvs
 
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-amd64
+#PIPVENV_BUILDDEPS_AMD__START
+
+#PIPVENV_BUILDDEPS_AMD__END
+FROM --platform=$BUILDPLATFORM python-venv-base AS python-venv-arm64
+#PIPVENV_BUILDDEPS_ARM__START
+
+#PIPVENV_BUILDDEPS_ARM__END
+FROM --platform=$BUILDPLATFORM python-venv-${TARGETPLATFORM} AS python-venv-arm64
 ARG TARGETPLATFORM
 COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3