diff --git a/Dockerfile b/Dockerfile index f0b3b03..af526ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ ARG BASE_IMAGE -FROM ${BASE_IMAGE:-library/alpine}:3.11 +FROM ${BASE_IMAGE:-library/alpine}:3.12 ARG QEMU_ARCH ENV QEMU_ARCH=${QEMU_ARCH:-x86_64} S6_KEEP_ENV=1 COPY qemu/qemu-${QEMU_ARCH}-static /usr/bin/ -RUN set -x && apk add --no-cache libgcc libstdc++ curl curl-dev coreutils tzdata shadow libstdc++ paxctl logrotate \ +RUN set -x && apk add --no-cache libgcc libstdc++ curl curl-dev coreutils tzdata shadow libstdc++ paxmark logrotate \ && case "${QEMU_ARCH}" in \ x86_64) S6_ARCH='amd64';; \ arm) S6_ARCH='armhf';; \ @@ -22,12 +22,12 @@ RUN set -x && apk add --no-cache libgcc libstdc++ curl curl-dev coreutils tzdata && rm -rf /tmp/* \ && sed -i "s#/var/log/messages {}.*# #g" /etc/logrotate.conf -ENV NODE_VERSION 12.18.0 +ENV NODE_VERSION 12.18.1 RUN set -x && curl -fLO https://github.com/oznu/alpine-node/releases/download/${NODE_VERSION}/node-v${NODE_VERSION}-linux-${QEMU_ARCH}-alpine.tar.gz \ && tar -xzf node-v${NODE_VERSION}-linux-${QEMU_ARCH}-alpine.tar.gz -C /usr --strip-components=1 --no-same-owner \ && rm -rf node-v${NODE_VERSION}-linux-${QEMU_ARCH}-alpine.tar.gz \ - && paxctl -cm `which node` \ + && paxmark `which node` \ && npm set prefix /usr/local \ && npm config set unsafe-perm true diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index d9e47e3..55661f1 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -27,7 +27,7 @@ RUN set -x && apt-get update \ && rm -rf /etc/cron.daily/apt-compat /etc/cron.daily/dpkg /etc/cron.daily/passwd /etc/cron.daily/exim4-base \ && sed -i "s#/var/log/messages {}.*# #g" /etc/logrotate.conf -ENV NODE_VERSION 12.18.0 +ENV NODE_VERSION 12.18.1 RUN case "${QEMU_ARCH}" in \ x86_64) NODE_ARCH='x64';; \