From 5b46330e280328496023f6db4e82c62a8345ccc0 Mon Sep 17 00:00:00 2001 From: sebadob Date: Wed, 25 Sep 2024 09:03:36 +0200 Subject: [PATCH] remove obsolete builder Dockerfiles --- Dockerfile_builder_musl | 148 ------------------------------ Dockerfile_builder_openssl_manual | 69 -------------- 2 files changed, 217 deletions(-) delete mode 100644 Dockerfile_builder_musl delete mode 100644 Dockerfile_builder_openssl_manual diff --git a/Dockerfile_builder_musl b/Dockerfile_builder_musl deleted file mode 100644 index 5c31e7ee..00000000 --- a/Dockerfile_builder_musl +++ /dev/null @@ -1,148 +0,0 @@ -ARG IMAGE - -FROM --platform=$BUILDPLATFORM $IMAGE AS rust - -# docker buildx args automatically available -ARG BUILDPLATFORM -ARG TARGETPLATFORM -ARG TARGETOS -ARG TARGETARCH - -ENV HOME=/home -ENV PATH="${PATH}:/home/.cargo/bin" - -WORKDIR /home - -RUN cat < /usr/local/bin/target -#!/bin/bash -if [ "arm64" = "$TARGETARCH" ]; then - echo aarch64-unknown-linux-musl -else - echo x86_64-unknown-linux-musl -fi -EOF -RUN chmod +x /usr/local/bin/target - -# node and npm -#RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ -# apt install -y nodejs && \ -# rm -rf /var/lib/apt/lists/* - -# install latest stable rust + tools -RUN < /etc/ld.so.conf.d/lib64.conf -ldconfig - -cd .. -rm -rf openssl* -EOF - -############################################ -############################################ -############################################ - -FROM --platform=$BUILDPLATFORM $IMAGE - -# docker buildx args automatically available -ARG BUILDPLATFORM -ARG TARGETPLATFORM -ARG TARGETOS -ARG TARGETARCH - -ENV HOME=/home - -ENV PATH="${PATH}:/home/.cargo/bin" -ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig - -ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-linux-musl-gcc -ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUNNER="/qemu-runner x86_64" -ENV CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc - -ENV LD_LIBRARY_PATH="${PATH}:/usr/local/lib64:${LD_LIBRARY_PATH}" -ENV PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig" - -# node and npm -RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ - apt install -y nodejs && \ - rm -rf /var/lib/apt/lists/* -# TODO the overhead of a direct npm installation at this point is rather small, but fix when more time -# TODO something is missing for the COPY's -# When the missing parts are found, move the installation up in stage 1 again -#COPY --from=stage1 /etc/alternatives/nodejs /etc/alternatives/nodejs -#COPY --from=stage1 /etc/apt/preferences.d/nodejs /etc/apt/preferences.d/nodejs -#COPY --from=stage1 /usr/bin/npm /usr/bin/npm -#COPY --from=stage1 /usr/bin/node /usr/bin/node -#COPY --from=stage1 /usr/bin/nodejs /usr/bin/nodejs -#COPY --from=stage1 /usr/include/node /usr/include/node -#COPY --from=stage1 /usr/share/doc/node /usr/share/doc/node -#COPY --from=stage1 /var/lib/dpkg/alternatives/nodejs /var/lib/dpkg/alternatives/nodejs -#COPY --from=stage1 /usr/lib/node_modules /usr/lib/node_modules - -# rust and tools -COPY --from=rust /usr/local/bin/target /usr/local/bin/target -COPY --from=rust /home /home - -# openssl -COPY --from=openssl /etc/ld.so.conf.d/lib64.conf /etc/ld.so.conf.d/lib64.conf -COPY --from=openssl /usr/local/lib64 /usr/local/lib64 -COPY --from=openssl /usr/local/include/openssl /usr/local/include/openssl -COPY --from=openssl /usr/local/bin/openssl /usr/local/bin/openssl -COPY --from=openssl /usr/local/bin/c_rehash /usr/local/bin/c_rehash -COPY --from=openssl /usr/local/ssl /usr/local/ssl -COPY --from=openssl /usr/local/share/man /usr/local/share/man -COPY --from=openssl /usr/local/share/doc/openssl /usr/local/share/doc/openssl - -RUN ldconfig - -WORKDIR /work - -CMD ["/bin/bash"] diff --git a/Dockerfile_builder_openssl_manual b/Dockerfile_builder_openssl_manual deleted file mode 100644 index 3cca26d0..00000000 --- a/Dockerfile_builder_openssl_manual +++ /dev/null @@ -1,69 +0,0 @@ -ARG IMAGE - -FROM $IMAGE AS openssl - -ENV LD_LIBRARY_PATH="${PATH}:/usr/local/lib64" -ENV PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig" -ENV MAKEFLAGS="-j32" - -WORKDIR /root - -RUN < /etc/ld.so.conf.d/lib64.conf -ldconfig - -cd .. -rm -rf openssl* -EOF - -############################################ -############################################ - -FROM $IMAGE - -ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig -ENV LD_LIBRARY_PATH="${PATH}:/usr/local/lib64" -ENV PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig" - -ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc -ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc - -RUN <