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

eclipse · Nov 6, 2019 · 678131e · 678131e
1 parent 28c11f4
commit 678131e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/docker/1.5/Dockerfile b/docker/1.5/Dockerfile
@@ -14,8 +14,7 @@ RUN set -x && \
         cmake \
         gnupg \
         libressl-dev \
-        util-linux-dev \
-        ca-certificates && \
+        util-linux-dev && \
     wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
     mkdir -p /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 && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
-        libuuid && \
+        libuuid ca-certificates && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/1.6/Dockerfile b/docker/1.6/Dockerfile
@@ -14,8 +14,7 @@ RUN set -x && \
         cmake \
         gnupg \
         libressl-dev \
-        util-linux-dev \
-        ca-certificates && \
+        util-linux-dev && \
     wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
     mkdir -p /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 -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
     chown -R mosquitto:mosquitto /mosquitto && \
+    apk --no-cache add \
+        ca-certificates && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
@@ -13,8 +13,7 @@ RUN set -x && \
         cmake \
         gnupg \
         libressl-dev \
-        util-linux-dev \
-        ca-certificates && \
+        util-linux-dev && \
     wget https://github.com/warmcat/libwebsockets/archive/v${LWS_VERSION}.tar.gz -O /tmp/lws.tar.gz && \
     mkdir -p /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 -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
     chown -R mosquitto:mosquitto /mosquitto && \
+    apk --no-cache add \
+        ca-certificates && \
     apk del build-deps && \
     rm -rf /build