From f007d880b0a3acf3484e7124325721b877d72efd Mon Sep 17 00:00:00 2001 From: "Tobias L. Maier" Date: Sun, 29 Apr 2018 05:17:40 +0200 Subject: [PATCH] Fix ARG COMPOSE_VERSION being defind outside build stage See https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact --- 1.12/Dockerfile | 4 ++-- 1.13/Dockerfile | 4 ++-- 17.03/Dockerfile | 4 ++-- 17.06/Dockerfile | 4 ++-- 17.09/Dockerfile | 4 ++-- 17.12/Dockerfile | 4 ++-- 17/Dockerfile | 4 ++-- 18.02/Dockerfile | 4 ++-- 18/Dockerfile | 4 ++-- latest/Dockerfile | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/1.12/Dockerfile b/1.12/Dockerfile index f884eb5..c419874 100644 --- a/1.12/Dockerfile +++ b/1.12/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.8.* - FROM docker:1.12 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.8.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/1.13/Dockerfile b/1.13/Dockerfile index a97d90c..97b48f6 100644 --- a/1.13/Dockerfile +++ b/1.13/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.10.* - FROM docker:1.13 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.10.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/17.03/Dockerfile b/17.03/Dockerfile index c0e2e1a..b957519 100644 --- a/17.03/Dockerfile +++ b/17.03/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.11.* - FROM docker:17.03 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.11.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/17.06/Dockerfile b/17.06/Dockerfile index 0169bc2..5f0933d 100644 --- a/17.06/Dockerfile +++ b/17.06/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.15.* - FROM docker:17.06 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.15.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/17.09/Dockerfile b/17.09/Dockerfile index 2ae0640..a4bffd4 100644 --- a/17.09/Dockerfile +++ b/17.09/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.16.* - FROM docker:17.09 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.16.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/17.12/Dockerfile b/17.12/Dockerfile index 919fb03..66bec3b 100644 --- a/17.12/Dockerfile +++ b/17.12/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.18.* - FROM docker:17.12 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.18.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/17/Dockerfile b/17/Dockerfile index 942ec86..5c7e72f 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.18.* - FROM docker:17 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.18.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/18.02/Dockerfile b/18.02/Dockerfile index c6b3db2..9051824 100644 --- a/18.02/Dockerfile +++ b/18.02/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.19.* - FROM docker:18.02 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.19.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/18/Dockerfile b/18/Dockerfile index 2103058..2bb7c6d 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION=1.19.* - FROM docker:18 MAINTAINER Tobias Maier +ARG COMPOSE_VERSION=1.19.* + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" diff --git a/latest/Dockerfile b/latest/Dockerfile index c8cf427..c983df3 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -1,7 +1,7 @@ -ARG COMPOSE_VERSION= - FROM docker:latest MAINTAINER Tobias Maier +ARG COMPOSE_VERSION= + RUN apk add --no-cache py-pip RUN pip install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}"