From 69c7b033e14438fcbb8fef95155e5d60b1bf3ac6 Mon Sep 17 00:00:00 2001 From: Markus Frosch <markus.frosch@icinga.com> Date: Wed, 4 Apr 2018 12:07:53 +0200 Subject: [PATCH] Embed build scripts into all container --- jessie/x86/Dockerfile | 4 ++++ jessie/x86_64/Dockerfile | 4 ++++ stretch/x86/Dockerfile | 4 ++++ stretch/x86_64/Dockerfile | 4 ++++ wheezy/x86/Dockerfile | 4 ++++ wheezy/x86_64/Dockerfile | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/jessie/x86/Dockerfile b/jessie/x86/Dockerfile index ca000b3..b816191 100644 --- a/jessie/x86/Dockerfile +++ b/jessie/x86/Dockerfile @@ -17,3 +17,7 @@ RUN groupadd -g 1000 jenkins \ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/jessie/x86_64/Dockerfile b/jessie/x86_64/Dockerfile index 8458192..5c8c634 100644 --- a/jessie/x86_64/Dockerfile +++ b/jessie/x86_64/Dockerfile @@ -17,3 +17,7 @@ RUN groupadd -g 1000 jenkins \ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/stretch/x86/Dockerfile b/stretch/x86/Dockerfile index 6dbd366..dd205e4 100644 --- a/stretch/x86/Dockerfile +++ b/stretch/x86/Dockerfile @@ -17,3 +17,7 @@ RUN groupadd -g 1000 jenkins \ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/stretch/x86_64/Dockerfile b/stretch/x86_64/Dockerfile index 02949e7..9f6e2aa 100644 --- a/stretch/x86_64/Dockerfile +++ b/stretch/x86_64/Dockerfile @@ -17,3 +17,7 @@ RUN groupadd -g 1000 jenkins \ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/wheezy/x86/Dockerfile b/wheezy/x86/Dockerfile index 15d2c42..a69afa2 100644 --- a/wheezy/x86/Dockerfile +++ b/wheezy/x86/Dockerfile @@ -17,3 +17,7 @@ RUN groupadd -g 1000 jenkins \ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/wheezy/x86_64/Dockerfile b/wheezy/x86_64/Dockerfile index 2257210..9f7ae12 100644 --- a/wheezy/x86_64/Dockerfile +++ b/wheezy/x86_64/Dockerfile @@ -17,3 +17,7 @@ RUN groupadd -g 1000 jenkins \ RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] -- GitLab