From db209680e734bbbac29e9788b17c92c6a24e7043 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 10 Aug 2017 14:42:20 -0400 Subject: [PATCH] Use build-arg to make FROM image a variable Change-Id: I14fc9c65e965c0394b1f99b724b8a61c13d5df9b --- centos/Dockerfile | 3 ++- centos/fwaas/Dockerfile | 3 ++- debian/Dockerfile | 3 ++- debian/fwaas/Dockerfile | 3 ++- ubuntu/Dockerfile | 3 ++- ubuntu/fwaas/Dockerfile | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/centos/Dockerfile b/centos/Dockerfile index db00719..e5d2829 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -1,4 +1,5 @@ -FROM centos:7 +ARG FROM=centos:7 +FROM ${FROM} ENV PATH=/var/lib/openstack/bin:$PATH ENV PROJECT=neutron diff --git a/centos/fwaas/Dockerfile b/centos/fwaas/Dockerfile index 6ee35de..65411b9 100644 --- a/centos/fwaas/Dockerfile +++ b/centos/fwaas/Dockerfile @@ -1,4 +1,5 @@ -FROM openstackloci/neutron:centos +ARG FROM=openstackloci/neutron:centos +FROM ${FROM} ENV PROJECT=neutron-fwaas ARG WHEELS diff --git a/debian/Dockerfile b/debian/Dockerfile index fd19700..9d91e61 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,4 +1,5 @@ -FROM debian:jessie-slim +ARG FROM=debian:jessie-slim +FROM ${FROM} ENV PATH=/var/lib/openstack/bin:$PATH ENV PROJECT=neutron diff --git a/debian/fwaas/Dockerfile b/debian/fwaas/Dockerfile index 9283028..0b8dd63 100644 --- a/debian/fwaas/Dockerfile +++ b/debian/fwaas/Dockerfile @@ -1,4 +1,5 @@ -FROM openstackloci/neutron:debian +ARG FROM=openstackloci/neutron:debian +FROM ${FROM} ENV PROJECT=neutron-fwaas ARG WHEELS diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index ed18604..759d71a 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:xenial +ARG FROM=ubuntu:xenial +FROM ${FROM} ENV PATH=/var/lib/openstack/bin:$PATH ENV PROJECT=neutron diff --git a/ubuntu/fwaas/Dockerfile b/ubuntu/fwaas/Dockerfile index d1e000d..89751ea 100644 --- a/ubuntu/fwaas/Dockerfile +++ b/ubuntu/fwaas/Dockerfile @@ -1,4 +1,5 @@ -FROM openstackloci/neutron:ubuntu +ARG FROM=openstackloci/neutron:ubuntu +FROM ${FROM} ENV PROJECT=neutron-fwaas ARG WHEELS