Merge pull request #520 from fbelavenuto/docker-compiler

Improving docker compiler
fbelavenuto · Jan 19, 2023 · e3c7997 · e3c7997
2 parents abc533f + af04ace
commit e3c7997
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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