fix py2

Signed-off-by: Jess Frazelle <[email protected]>
maxkratz · Jan 11, 2017 · 3c1634b · 3c1634b
1 parent 31c1084
commit 3c1634b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/ansible/Dockerfile b/ansible/Dockerfile
@@ -12,7 +12,7 @@ MAINTAINER Christian Koep <[email protected]>
 
 RUN builddeps=' \
 		python-dev \
-		py-pip \
+		py2-pip \
 		musl-dev \
 		openssl-dev \
 		libffi-dev \

diff --git a/awscli/Dockerfile b/awscli/Dockerfile
@@ -6,7 +6,7 @@ RUN apk --no-cache add \
 	groff \
 	less \
 	python \
-	py-pip \
+	py2-pip \
 	&& pip install awscli \
 	&& mkdir -p /root/.aws \
 	&& { \

diff --git a/certbot/Dockerfile b/certbot/Dockerfile
@@ -14,7 +14,7 @@ RUN apk --no-cache add \
 	py-mock \
 	py-openssl \
 	py-parsedatetime \
-	py-pip \
+	py2-pip \
 	py-requests \
 	py-rfc3339 \
 	py-setuptools \

diff --git a/cli53/Dockerfile b/cli53/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:latest
 RUN apk --no-cache add \
 	ca-certificates \
 	python \
-	py-pip \
+	py2-pip \
 	&& pip install cli53
 
 ENTRYPOINT [ "cli53" ]
diff --git a/couchpotato/Dockerfile b/couchpotato/Dockerfile
@@ -24,7 +24,7 @@ RUN apk add --no-cache \
 	openssl-dev \
 	python \
 	python-dev \
-	py-pip \
+	py2-pip \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN pip install \

diff --git a/dcos-cli/Dockerfile b/dcos-cli/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Jessie Frazelle <[email protected]>
 RUN apk --no-cache add \
 	ca-certificates \
 	python \
-	py-pip \
+	py2-pip \
 	&& pip install dcoscli
 
 # path to the DCOS CLI binary

diff --git a/gcalcli/Dockerfile b/gcalcli/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME /home/gcalcli
 RUN apk --no-cache add \
 	python \
 	python-dev \
-	py-pip \
+	py2-pip \
 	build-base \
 	&& adduser -S gcalcli \
 	&& chown -R gcalcli $HOME \

diff --git a/httpie/Dockerfile b/httpie/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Jessie Frazelle <[email protected]>
 RUN apk --no-cache add \
 	ca-certificates \
 	python \
-	py-pip \
+	py2-pip \
 	&& pip install httpie httpie-unixsocket
 
 ENTRYPOINT [ "http" ]
diff --git a/imagemin/Dockerfile b/imagemin/Dockerfile
@@ -6,17 +6,21 @@
 #	--entrypoint bash \
 #	jess/imagemin
 #
-FROM alpine:latest
+FROM node:alpine
 MAINTAINER Jessie Frazelle <[email protected]>
 
 RUN apk --no-cache add \
-	autoconf \
-	automake \
-	build-base \
 	file \
-	libpng-dev \
-	nasm \
-	nodejs \
-	&& npm install --global imagemin-cli
+	libpng
+
+RUN set -x \
+	&& apk add --no-cache --virtual .build-deps \
+		autoconf \
+		automake \
+		build-base \
+		libpng-dev \
+		nasm \
+	&& npm install --global imagemin-cli \
+	&& apk del .build-deps
 
 CMD [ "imagemin", "--help" ]
diff --git a/wee-slack/Dockerfile b/wee-slack/Dockerfile
@@ -16,7 +16,7 @@ FROM alpine:latest
 RUN apk add --no-cache \
 	ca-certificates \
 	python \
-	py-pip \
+	py2-pip \
 	weechat \
 	weechat-perl \
 	weechat-python