diff --git a/centos/Dockerfile b/centos/Dockerfile index e656e71..43d3281 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=glance diff --git a/centos/ceph/Dockerfile b/centos/ceph/Dockerfile index f23719f..580c78f 100644 --- a/centos/ceph/Dockerfile +++ b/centos/ceph/Dockerfile @@ -1,4 +1,5 @@ -FROM openstackloci/glance:centos +ARG FROM=openstackloci/glance:centos +FROM ${FROM} ARG OVERRIDE=override diff --git a/debian/Dockerfile b/debian/Dockerfile index 4865094..d5fc4fe 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=glance diff --git a/debian/ceph/Dockerfile b/debian/ceph/Dockerfile index ea0e7b6..64530c9 100644 --- a/debian/ceph/Dockerfile +++ b/debian/ceph/Dockerfile @@ -1,4 +1,5 @@ -FROM openstackloci/glance:debian +ARG FROM=openstackloci/glance:debian +FROM ${FROM} ARG OVERRIDE=override diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 2f15c69..62371a0 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=glance diff --git a/ubuntu/ceph/Dockerfile b/ubuntu/ceph/Dockerfile index 0ac766d..014f84b 100644 --- a/ubuntu/ceph/Dockerfile +++ b/ubuntu/ceph/Dockerfile @@ -1,4 +1,5 @@ -FROM openstackloci/glance:ubuntu +ARG FROM=openstackloci/glance:ubuntu +FROM ${FROM} ARG OVERRIDE=override