From e0e2d6e96a07c354bf6e30417e78adc0710f4aeb Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 17 Dec 2017 10:48:54 +0000 Subject: [PATCH] osmo-*: Ensure container is rebuilt if nightly repo is updated Let's use the "ADD" trick that we use for git repositories also for the osmocom:nightly debian package feed. This way any change to the package feed will result in a rebuild of the container. --- debian-jessie-osmocom/Dockerfile | 5 ++++- osmo-bts-master/Dockerfile | 5 ++++- osmo-ggsn-master/Dockerfile | 5 ++++- osmo-hnbgw-master/Dockerfile | 5 ++++- osmo-mgw-master/Dockerfile | 5 ++++- osmo-nitb-master/Dockerfile | 5 ++++- osmo-sgsn-master/Dockerfile | 5 ++++- osmo-stp-master/Dockerfile | 5 ++++- osmo-virtphy-master/Dockerfile | 5 ++++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile index e8eb0f8d..3de6ebdf 100644 --- a/debian-jessie-osmocom/Dockerfile +++ b/debian-jessie-osmocom/Dockerfile @@ -2,12 +2,15 @@ FROM debian:jessie MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 31ec9985..c29905e1 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index e3eec485..eecacedf 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 4e9c27b4..2f0c12d6 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-stretch-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 6d6bb171..07f38223 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index f3d34853..f7648a7b 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index cc99eb1a..a4e9a4bc 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index f363fc2b..39e9b204 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile index 2345b06c..9bac7ce2 100644 --- a/osmo-virtphy-master/Dockerfile +++ b/osmo-virtphy-master/Dockerfile @@ -2,12 +2,15 @@ FROM laforge/debian-jessie-build MAINTAINER Harald Welte +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" + COPY Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list +ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ telnet \