Remove explicit mention of py-setuptools in OpenMapKit Dockerfile.

This commit is contained in:
Disassembler 2017-12-13 10:17:58 +01:00
parent 8e51e09d58
commit 4946fe2c71

View File

@ -3,7 +3,7 @@ MAINTAINER Disassembler <disassembler@dasm.cz>
RUN apk --no-cache add python2 RUN apk --no-cache add python2
RUN apk --no-cache add nodejs git build-base openjdk8-jre-base py-setuptools py2-pip \ RUN apk --no-cache add nodejs git build-base openjdk8-jre-base py2-pip \
&& git clone --depth 1 https://github.com/AmericanRedCross/OpenMapKitServer /srv/omk \ && git clone --depth 1 https://github.com/AmericanRedCross/OpenMapKitServer /srv/omk \
&& cd /srv/omk \ && cd /srv/omk \
&& git submodule update --init \ && git submodule update --init \
@ -14,7 +14,7 @@ RUN apk --no-cache add nodejs git build-base openjdk8-jre-base py-setuptools py2
&& addgroup -S omk \ && addgroup -S omk \
&& adduser -S -h /srv/omk -H -s /bin/sh -g omk -G omk omk \ && adduser -S -h /srv/omk -H -s /bin/sh -g omk -G omk omk \
&& chown -R omk:omk /srv/omk/data/deployments /srv/omk/data/submissions \ && chown -R omk:omk /srv/omk/data/deployments /srv/omk/data/submissions \
&& apk --no-cache del git build-base py-setuptools py2-pip \ && apk --no-cache del git build-base py2-pip \
&& rm -rf /srv/omk/.git* /srv/omk/api/odk/pyxform/.git* \ && rm -rf /srv/omk/.git* /srv/omk/api/odk/pyxform/.git* \
&& rm -rf /root/* || true && rm -rf /root/* || true