From 38342a918f46dfa879912329bebcbc85ae50482b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 23 Sep 2019 13:56:26 +0200 Subject: [PATCH] try to fix missing root dir --- docker/Dockerfile.do.linux.amd64 | 5 ++--- docker/Dockerfile.ec2.linux.amd64 | 5 ++--- docker/Dockerfile.gce.linux.amd64 | 6 +++--- docker/Dockerfile.hcloud.linux.amd64 | 6 ++---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile.do.linux.amd64 b/docker/Dockerfile.do.linux.amd64 index b9ee63e..26e5051 100644 --- a/docker/Dockerfile.do.linux.amd64 +++ b/docker/Dockerfile.do.linux.amd64 @@ -31,10 +31,9 @@ RUN \ apk update \ && apk add --update --no-cache ${PACKAGES} \ && rm -rf /var/cache/apk/* \ - && pip install --upgrade pip \ + && pip install --upgrade --no-cache-dir pip \ && pip install --no-cache-dir ${PIP_PACKAGES} \ - && rm -rf /root/.cache \ - && mkdir /root + && rm -rf /root/.cache/ USER root ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/docker/Dockerfile.ec2.linux.amd64 b/docker/Dockerfile.ec2.linux.amd64 index bfed978..d065862 100644 --- a/docker/Dockerfile.ec2.linux.amd64 +++ b/docker/Dockerfile.ec2.linux.amd64 @@ -32,10 +32,9 @@ RUN \ apk update \ && apk add --update --no-cache ${PACKAGES} \ && rm -rf /var/cache/apk/* \ - && pip install --upgrade pip \ + && pip install --upgrade --no-cache-dir pip \ && pip install --no-cache-dir ${PIP_PACKAGES} \ - && rm -rf /root/.cache \ - && mkdir /root + && rm -rf /root/.cache/ USER root ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/docker/Dockerfile.gce.linux.amd64 b/docker/Dockerfile.gce.linux.amd64 index f0209ae..b27d96c 100644 --- a/docker/Dockerfile.gce.linux.amd64 +++ b/docker/Dockerfile.gce.linux.amd64 @@ -32,10 +32,10 @@ RUN \ apk update \ && apk add --update --no-cache ${PACKAGES} \ && rm -rf /var/cache/apk/* \ - && pip install --upgrade pip \ + && pip install --upgrade --no-cache-dir pip \ && pip install --no-cache-dir ${PIP_PACKAGES} \ - && rm -rf /root/.cache \ - && mkdir -p /root/.ssh \ + && rm -rf /root/.cache/ \ + && mkdir /root/.ssh \ && chmod 700 /root/.ssh USER root diff --git a/docker/Dockerfile.hcloud.linux.amd64 b/docker/Dockerfile.hcloud.linux.amd64 index ba8c4ee..4dcd4ef 100644 --- a/docker/Dockerfile.hcloud.linux.amd64 +++ b/docker/Dockerfile.hcloud.linux.amd64 @@ -21,7 +21,6 @@ ENV PACKAGES="\ ENV PIP_PACKAGES="\ ansible~=2.8.0 \ molecule[hetznercloud] \ - virtualenv \ pycrypto \ hcloud \ " @@ -32,10 +31,9 @@ RUN \ apk update \ && apk add --update --no-cache ${PACKAGES} \ && rm -rf /var/cache/apk/* \ - && pip install --upgrade pip \ + && pip install --upgrade --no-cache-dir pip \ && pip install --no-cache-dir ${PIP_PACKAGES} \ - && rm -rf /root/.cache \ - && mkdir /root + && rm -rf /root/.cache/ USER root ENTRYPOINT ["/docker-entrypoint.sh"]