diff --git a/_CI-CD/debian-golang/Dockerfile b/_CI-CD/debian-golang/Dockerfile index 099c88e..5cbe261 100644 --- a/_CI-CD/debian-golang/Dockerfile +++ b/_CI-CD/debian-golang/Dockerfile @@ -1,9 +1,11 @@ -FROM debian:stable-slim +FROM cr.lan/debian-stable -RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \ - sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \ - apt-get update && apt-get install -y \ - golang make git && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* && \ +RUN apt-get update && apt-get install -y \ + golang make git + +RUN apt-get remove -y --purge man-db ;\ + apt-get autoremove -y --purge ;\ + apt-get clean -y ;\ + rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/cache/apt/* + \ No newline at end of file diff --git a/_CI-CD/debian-stable-build-essential/Dockerfile b/_CI-CD/debian-stable-build-essential/Dockerfile index e499218..e14097f 100644 --- a/_CI-CD/debian-stable-build-essential/Dockerfile +++ b/_CI-CD/debian-stable-build-essential/Dockerfile @@ -1,13 +1,15 @@ -FROM debian:stable-slim +FROM cr.lan/debian-stable -RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \ - sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \ - apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y \ dnsutils procps nmap bash iputils-ping bash \ build-essential make ccache distcc-pump distcc g++ \ - libncursesw5-dev && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* && \ + libncursesw5-dev + +RUN apt-get remove -y --purge man-db ;\ + apt-get autoremove -y --purge ;\ + apt-get clean -y ;\ + rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/cache/apt/* + ADD docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file diff --git a/_CI-CD/debian-testing/Dockerfile b/_CI-CD/debian-testing/Dockerfile index dc721df..3af3557 100644 --- a/_CI-CD/debian-testing/Dockerfile +++ b/_CI-CD/debian-testing/Dockerfile @@ -3,9 +3,13 @@ FROM debian:testing-slim RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \ sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \ apt-get update && apt-get install -y \ - dnsutils procps nmap bash iputils-ping bash && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/* && \ + dnsutils procps nmap bash iputils-ping bash + +RUN apt-get remove -y --purge man-db ;\ + apt-get autoremove -y --purge ;\ + apt-get clean -y ;\ + rm -rf /var/lib/apt/lists/* ;\ rm -rf /var/cache/apt/* + ADD docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file diff --git a/_CI-CD/distcc/Dockerfile b/_CI-CD/distcc/Dockerfile index 2f57d0c..f9695db 100644 --- a/_CI-CD/distcc/Dockerfile +++ b/_CI-CD/distcc/Dockerfile @@ -1,18 +1,19 @@ -FROM debian:stable-slim +FROM cr.lan/debian-stable-build-essential -RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \ - sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \ - apt-get update && \ +RUN apt-get update && \ apt-get install -y \ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \ multiarch-support dpkg-dev distcc ccache \ - build-essential gcc cpp g++ clang llvm && \ - apt-get clean -y && \ - rm -rf /var/lib/apt/lists/*; \ - rm -rf /var/cache/apt/*; \ - #removing distcc conf, no zeroconf - rm -fv /etc/distcc/hosts + build-essential gcc cpp g++ clang llvm + + +RUN apt-get remove -y --purge man-db ;\ + apt-get autoremove -y --purge ;\ + apt-get clean -y ;\ + rm -rf /var/lib/apt/lists/* ;\ + rm -rf /var/cache/apt/* + # Op port EXPOSE 3632 # Stats port