From 8b67f90bd3d25c6457801303fd2a151127e74c58 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Thu, 30 Nov 2017 14:44:04 +0800 Subject: add ARG in Dockerfile when run the command "docker build --no-cache -t opnfv/compass-tasks:latest --build-arg BRANCH=master -f Dockerfile ." if docker version is lower 1.13, it will fail when not using build-arg in Dockerfile Change-Id: I891a37731d242aba4e37c7b56e0361c741e7eac8 Signed-off-by: wutianwei --- compass-cobbler/Dockerfile | 1 + compass-db/Dockerfile | 1 + compass-deck/Dockerfile | 1 + compass-tasks-k8s/Dockerfile | 4 +++- compass-tasks-osa/Dockerfile | 3 ++- compass-tasks/Dockerfile | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/compass-cobbler/Dockerfile b/compass-cobbler/Dockerfile index 2c68b64..5f5f2d1 100644 --- a/compass-cobbler/Dockerfile +++ b/compass-cobbler/Dockerfile @@ -1,6 +1,7 @@ FROM compassindocker/systemd-base ENV container docker VOLUME [ "/sys/fs/cgroup" ] +ARG BRANCH=master # pkgs and services... RUN yum -y update && \ 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 -- cgit 1.2.3-korg