d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docker - ca-certificates must not be installed in build-deps

Browse Source
This commit is contained in:
Roger A. Light 2019-11-06 14:12:36 +00:00
parent 28c11f4cce
commit 678131e393
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/1.5/Dockerfile
View File

@ -14,8 +14,7 @@ RUN set -x && \
cmake \ cmake \
gnupg \ gnupg \
libressl-dev \ libressl-dev \
util-linux-dev \ util-linux-dev && \
ca-certificates && \
wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \ wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
mkdir -p /build/lws && \ mkdir -p /build/lws && \
tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \ tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \
@ -76,7 +75,7 @@ RUN set -x && \
install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \ install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
chown -R mosquitto:mosquitto /mosquitto && \ chown -R mosquitto:mosquitto /mosquitto && \
apk --no-cache add \ apk --no-cache add \
libuuid && \ libuuid ca-certificates && \
apk del build-deps && \ apk del build-deps && \
rm -rf /build rm -rf /build

5
docker/1.6/Dockerfile
View File

@ -14,8 +14,7 @@ RUN set -x && \
cmake \ cmake \
gnupg \ gnupg \
libressl-dev \ libressl-dev \
util-linux-dev \ util-linux-dev && \
ca-certificates && \
wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \ wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
mkdir -p /build/lws && \ mkdir -p /build/lws && \
tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \ tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \
@ -79,6 +78,8 @@ RUN set -x && \
install -s -m755 /build/mosq/src/mosquitto_passwd /usr/bin/mosquitto_passwd && \ install -s -m755 /build/mosq/src/mosquitto_passwd /usr/bin/mosquitto_passwd && \
install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \ install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
chown -R mosquitto:mosquitto /mosquitto && \ chown -R mosquitto:mosquitto /mosquitto && \
apk --no-cache add \
ca-certificates && \
apk del build-deps && \ apk del build-deps && \
rm -rf /build rm -rf /build

5
docker/local/Dockerfile
View File

@ -13,8 +13,7 @@ RUN set -x && \
cmake \ cmake \
gnupg \ gnupg \
libressl-dev \ libressl-dev \
util-linux-dev \ util-linux-dev && \
ca-certificates && \
wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \ wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
mkdir -p /build/lws && \ mkdir -p /build/lws && \
tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \ tar --strip=1 -xf /tmp/lws.tar.gz -C /build/lws && \
@ -60,6 +59,8 @@ RUN set -x && \
install -s -m755 /build/mosq/src/mosquitto_passwd /usr/bin/mosquitto_passwd && \ install -s -m755 /build/mosq/src/mosquitto_passwd /usr/bin/mosquitto_passwd && \
install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \ install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
chown -R mosquitto:mosquitto /mosquitto && \ chown -R mosquitto:mosquitto /mosquitto && \
apk --no-cache add \
ca-certificates && \
apk del build-deps && \ apk del build-deps && \
rm -rf /build rm -rf /build