From af04acef7743d350d2ace62d8aa67ca0a14bf249 Mon Sep 17 00:00:00 2001 From: Fabio Belavenuto Date: Thu, 19 Jan 2023 16:57:57 -0300 Subject: [PATCH] Improving docker compiler --- docker/syno-compiler/Dockerfile.template | 3 +-- docker/syno-compiler/build.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/syno-compiler/Dockerfile.template b/docker/syno-compiler/Dockerfile.template index fbb1fb76..5bdf39e3 100644 --- a/docker/syno-compiler/Dockerfile.template +++ b/docker/syno-compiler/Dockerfile.template @@ -29,7 +29,6 @@ FROM debian:8-slim ENV SHELL=/bin/bash \ ARCH=x86_64 -COPY --from=stage /opt /opt RUN apt update --yes && \ apt install --yes --no-install-recommends --no-install-suggests --allow-unauthenticated \ ca-certificates nano curl bc kmod git gettext texinfo autopoint gawk sudo \ @@ -38,9 +37,9 @@ RUN apt update --yes && \ rm -rf /var/lib/apt/lists/* && \ useradd --create-home --shell /bin/bash --uid 1000 --user-group arpl && \ echo "arpl ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/arpl && \ - chown 1000:1000 -R /opt && \ mkdir /output && chown 1000:1000 /output +COPY --from=stage --chown=1000:1000 /opt /opt COPY files/ / USER arpl diff --git a/docker/syno-compiler/build.sh b/docker/syno-compiler/build.sh index 65e0c1d4..d8922144 100755 --- a/docker/syno-compiler/build.sh +++ b/docker/syno-compiler/build.sh @@ -25,8 +25,7 @@ function prepare() { URLS["r1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%204.4.180%20%28r1000%29/r1000-${GCCLIB_VER}_x86_64-GPL.txz" URLS["epyc7002"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%20Linux%205.10.55%20%28epyc7002%29/epyc7002-${GCCLIB_VER}_x86_64-GPL.txz" - URLS["3.10.x"]="https://ufpr.dl.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/25426branch/bromolow-source/linux-3.10.x.txz" - + # Read platforms/kerver version echo "Reading platforms" declare -A PLATFORMS