From 470095c336e920e546902e8f445b3b8b7a8fcd59 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sat, 15 Apr 2017 17:20:39 +0000 Subject: [PATCH] Switch to single var for WHEELS Change-Id: I6551108bd4daa89d675193a1ec2ef6cdd9649919 Depends-On: I0d3b033dc5517622513b9028980edda8109baadc --- centos/Dockerfile | 4 +--- debian/Dockerfile | 4 +--- ubuntu/Dockerfile | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/centos/Dockerfile b/centos/Dockerfile index 303f351..dc07094 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -1,9 +1,7 @@ FROM centos:7 ENV PROJECT=glance -ARG DOCKER_REPO=openstackloci/requirements -ARG DOCKER_TAG=centos -ARG WHEELS +ARG WHEELS=openstackloci/requirements:centos ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG PROJECT_REF=master ARG SCRIPTS_REPO=https://github.com/openstack/loci diff --git a/debian/Dockerfile b/debian/Dockerfile index 5682291..7e05aee 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,9 +1,7 @@ FROM debian:jessie-slim ENV PROJECT=glance -ARG DOCKER_REPO=openstackloci/requirements -ARG DOCKER_TAG=debian -ARG WHEELS +ARG WHEELS=openstackloci/requirements:debian ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG PROJECT_REF=master ARG SCRIPTS_REPO=https://github.com/openstack/loci diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 5159834..7924425 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -1,9 +1,7 @@ FROM ubuntu:xenial ENV PROJECT=glance -ARG DOCKER_REPO=openstackloci/requirements -ARG DOCKER_TAG=ubuntu -ARG WHEELS +ARG WHEELS=openstackloci/requirements:ubuntu ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG PROJECT_REF=master ARG SCRIPTS_REPO=https://github.com/openstack/loci