diff options
| -rw-r--r-- | compass-cobbler/Dockerfile | 5 | ||||
| -rw-r--r-- | compass-db/Dockerfile | 1 | ||||
| -rw-r--r-- | compass-deck/Dockerfile | 1 | ||||
| -rw-r--r-- | compass-tasks-k8s/Dockerfile | 4 | ||||
| -rw-r--r-- | compass-tasks-osa/Dockerfile | 3 | ||||
| -rw-r--r-- | compass-tasks/Dockerfile | 1 |
6 files changed, 11 insertions, 4 deletions
diff --git a/compass-cobbler/Dockerfile b/compass-cobbler/Dockerfile index 2c68b64..ddb3161 100644 --- a/compass-cobbler/Dockerfile +++ b/compass-cobbler/Dockerfile @@ -1,13 +1,14 @@ FROM compassindocker/systemd-base ENV container docker VOLUME [ "/sys/fs/cgroup" ] +ARG BRANCH=master # pkgs and services... RUN yum -y update && \ yum -y install epel-release && \ yum -y install wget dhcp bind syslinux pykickstart file initscripts net-tools tcpdump xinetd vim avahi avahi-tools && \ - wget ftp://mirror.switch.ch/pool/4/mirror/fedora/linux/updates/22/armhfp/c/cobbler-2.6.10-1.fc22.noarch.rpm && \ - wget ftp://mirror.switch.ch/pool/4/mirror/fedora/linux/updates/22/armhfp/c/cobbler-web-2.6.10-1.fc22.noarch.rpm && \ + wget http://artifacts.opnfv.org/compass4nfv/package/cobbler/cobbler-2.6.10-1.fc22.noarch.rpm && \ + wget http://artifacts.opnfv.org/compass4nfv/package/cobbler/cobbler-web-2.6.10-1.fc22.noarch.rpm && \ yum -y localinstall cobbler-2.6.10-1.fc22.noarch.rpm cobbler-web-2.6.10-1.fc22.noarch.rpm && \ rm -f cobbler-2.6.10-1.fc22.noarch.rpm cobbler-web-2.6.10-1.fc22.noarch.rpm && \ systemctl enable cobblerd && \ diff --git a/compass-db/Dockerfile b/compass-db/Dockerfile index a7208a9..82871b9 100644 --- a/compass-db/Dockerfile +++ b/compass-db/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:trusty EXPOSE 3306 +ARG BRANCH=master RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server && \ diff --git a/compass-deck/Dockerfile b/compass-deck/Dockerfile index 764e7f1..218fed9 100644 --- a/compass-deck/Dockerfile +++ b/compass-deck/Dockerfile @@ -1,5 +1,6 @@ FROM huangxiangyu/centos-systemd +ARG BRANCH=master ADD . /root/compass-deck RUN /root/compass-deck/build.sh diff --git a/compass-tasks-k8s/Dockerfile b/compass-tasks-k8s/Dockerfile index 1203ffa..cd74cf8 100644 --- a/compass-tasks-k8s/Dockerfile +++ b/compass-tasks-k8s/Dockerfile @@ -1,6 +1,8 @@ -FROM huangxiangyu/compass-tasks:v0.3 +FROM opnfv/compass-tasks:latest #FROM localbuild/compass-tasks +ARG BRANCH=master + ADD ./run.sh /root/ RUN chmod +x /root/run.sh RUN /root/run.sh diff --git a/compass-tasks-osa/Dockerfile b/compass-tasks-osa/Dockerfile index d156687..77cf585 100644 --- a/compass-tasks-osa/Dockerfile +++ b/compass-tasks-osa/Dockerfile @@ -1,5 +1,6 @@ -FROM huangxiangyu/compass-tasks:v0.3 +FROM opnfv/compass-tasks:latest #FROM localbuild/compass-tasks +ARG BRANCH=master ADD ./run.sh /root/ ADD ./tacker_conf /opt/tacker_conf diff --git a/compass-tasks/Dockerfile b/compass-tasks/Dockerfile index 3beaf57..4fcfbbc 100644 --- a/compass-tasks/Dockerfile +++ b/compass-tasks/Dockerfile @@ -1,5 +1,6 @@ FROM centos:7 +ARG BRANCH=master ADD . /root/compass-tasks RUN /root/compass-tasks/build.sh |