From acf0c284e885e4583e8f7da6ed8ea4a98aeca96f Mon Sep 17 00:00:00 2001 From: Adam Reznechek Date: Mon, 1 May 2017 15:50:01 +0000 Subject: [PATCH 1/2] Build/pull ppc64le versions of debian/alpine images Switch templates over to using ppc64le images for builds of Alpine/Debian images on Power. Note that the Wheezy base image for ppc64le doesn't exist today. --- 3.3/Dockerfile | 2 +- 3.3/alpine/Dockerfile | 2 +- 3.3/wheezy/Dockerfile | 2 +- 3.4/Dockerfile | 2 +- 3.4/alpine/Dockerfile | 2 +- 3.4/wheezy/Dockerfile | 2 +- 3.5/Dockerfile | 2 +- 3.5/alpine/Dockerfile | 2 +- 3.6/Dockerfile | 2 +- 3.6/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 605d892cf..f1d12e180 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:jessie +FROM ppc64le/buildpack-deps:jessie # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile index 3be5dc0d1..bedad2f46 100644 --- a/3.3/alpine/Dockerfile +++ b/3.3/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM ppc64le/alpine:edge # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile index e4b252850..4e36fd55f 100644 --- a/3.3/wheezy/Dockerfile +++ b/3.3/wheezy/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:wheezy +FROM ppc64le/buildpack-deps:wheezy # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.4/Dockerfile b/3.4/Dockerfile index 5231c2b1a..084550962 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:jessie +FROM ppc64le/buildpack-deps:jessie # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index 4af339d72..463d1832b 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM ppc64le/alpine:edge # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index c52cb1e17..4bb26ea73 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:wheezy +FROM ppc64le/buildpack-deps:wheezy # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 75631ff0d..8abc46579 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:jessie +FROM ppc64le/buildpack-deps:jessie # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile index 3c854cd32..b39f13554 100644 --- a/3.5/alpine/Dockerfile +++ b/3.5/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM ppc64le/alpine:edge # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.6/Dockerfile b/3.6/Dockerfile index f418c54f0..771ed4433 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:jessie +FROM ppc64le/buildpack-deps:jessie # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile index 4cbe96e41..2b66d99dc 100644 --- a/3.6/alpine/Dockerfile +++ b/3.6/alpine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.4 +FROM ppc64le/alpine:edge # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index b1bc3b0aa..a8f46c1a6 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM ppc64le/alpine:edge # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index e9562fb91..fa5a6378e 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie +FROM ppc64le/buildpack-deps:jessie # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH From 405c0e317c3c2729b0613b412b17ce75dfd2d084 Mon Sep 17 00:00:00 2001 From: Adam Reznechek Date: Mon, 1 May 2017 17:12:03 +0000 Subject: [PATCH 2/2] Switch over 2.7 alpine image to ppc64le Update the 2.7 image since the update script doesn't hit that by default. --- 2.7/alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index 1ea23e973..36ab211ff 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM ppc64le/alpine:edge # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH