From 5a88138f604223ef619bb5ea5ea22639818b2efd Mon Sep 17 00:00:00 2001 From: jackgr Date: Thu, 31 Mar 2016 13:16:19 -0700 Subject: [PATCH] Revise apk package handling --- rootfs/expandybird/Dockerfile | 13 +------------ rootfs/manager/Dockerfile | 4 +--- rootfs/resourcifier/Dockerfile | 4 +--- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/rootfs/expandybird/Dockerfile b/rootfs/expandybird/Dockerfile index d1de3f72e..559041c4a 100644 --- a/rootfs/expandybird/Dockerfile +++ b/rootfs/expandybird/Dockerfile @@ -17,22 +17,11 @@ FROM alpine:3.3 COPY . / # install common packages -RUN apk add --update-cache curl python - -WORKDIR /opt - -# install pip -RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/7.1.2/contrib/get-pip.py | python - +RUN apk add --no-cache curl python py-pip # install dependencies RUN pip install --disable-pip-version-check --no-cache-dir -r /opt/expansion/requirements.txt -# cleanup. -RUN apk del --purge \ - curl \ - python \ - && rm -rf /var/cache/apk/* - # define execution environment CMD ["/bin/expandybird", "-expansion_binary", "/opt/expansion/expansion.py"] EXPOSE 8000 diff --git a/rootfs/manager/Dockerfile b/rootfs/manager/Dockerfile index a33e4f912..189ae1a4a 100644 --- a/rootfs/manager/Dockerfile +++ b/rootfs/manager/Dockerfile @@ -16,9 +16,7 @@ FROM alpine:3.3 COPY . / # Install CA certs -RUN apk add --update-cache ca-certificates -RUN apk del --purge ca-certificates \ - && rm -rf /var/cache/apk/* +RUN apk add --no-cache ca-certificates EXPOSE 8080 CMD ["/bin/manager", "--kubectl=/bin/kubectl"] diff --git a/rootfs/resourcifier/Dockerfile b/rootfs/resourcifier/Dockerfile index e9ffb8ec7..8359b8a69 100644 --- a/rootfs/resourcifier/Dockerfile +++ b/rootfs/resourcifier/Dockerfile @@ -16,9 +16,7 @@ FROM alpine:3.3 COPY . / # Install CA certs -RUN apk add --update-cache ca-certificates -RUN apk del --purge ca-certificates \ - && rm -rf /var/cache/apk/* +RUN apk add --no-cache ca-certificates EXPOSE 8080 CMD ["/bin/resourcifier", "--kubectl=/bin/kubectl"]