From 49790d2e874effb24322fc5aab14a65f6fa9f4bb Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 18 May 2018 09:53:43 -0400 Subject: [PATCH] Switch to jessie-slim for the slim variant Closes #618 --- 10/slim/Dockerfile | 4 ++-- 6/slim/Dockerfile | 4 ++-- 8/slim/Dockerfile | 4 ++-- 9/slim/Dockerfile | 4 ++-- Dockerfile-slim.template | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index ccd8ece964..083e2540ae 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index b88edcceaa..1b813a72a5 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 3e01a881fb..76e2204c26 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index aecbfbad49..0d4b768702 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index c65f224659..4657542277 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -27,7 +27,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \