diff --git a/Dockerfile b/Dockerfile index 90f20dd..262c14b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="sombochea@cubetiqs.com" # Build with root access USER root -ENV NODE_VERSION 16.17.1 -ENV NODE_SHA256 58118370085f0fb1a6a66cc5562d0c341e560ac9c4d0311307b671283b7f5671 +ENV NODE_VERSION 16.19.0 +ENV NODE_SHA256 f5817883eb3009972a031d635ea71ed8377808a6e831ae1c72e063e888cdd318 ENV USER_UID 1001 RUN addgroup -g ${USER_UID} node \ @@ -77,7 +77,7 @@ RUN addgroup -g ${USER_UID} node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ARG PNPM_VERSION=7.19.0 +ARG PNPM_VERSION=7.20.0 ENV PNPM_HOME=/root/.local/share/pnpm ENV PATH=$PATH:$PNPM_HOME diff --git a/Dockerfile.slim b/Dockerfile.slim new file mode 100644 index 0000000..56d8ec1 --- /dev/null +++ b/Dockerfile.slim @@ -0,0 +1,91 @@ +FROM cubetiq/calpine-os-linux:latest +LABEL maintainer="sombochea@cubetiqs.com" + +# Build with root access +USER root + +ENV NODE_VERSION 16.19.0 +ENV NODE_SHA256 f5817883eb3009972a031d635ea71ed8377808a6e831ae1c72e063e888cdd318 +ENV USER_UID 1001 + +RUN addgroup -g ${USER_UID} node \ + && adduser -u ${USER_UID} -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM=$NODE_SHA256 \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + DL_ROOT="https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "Downloading Node.js from ${DL_ROOT}"; \ + curl -fsSLO --compressed $DL_ROOT; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +# Checking packages version +RUN echo "NODE: $(node --version)" \ + && echo "NPM: $(npm --version)" \ + && echo "NPX: $(npx --version)" + +COPY entrypoint.sh /usr/local/bin/ + +RUN chmod +x /usr/local/bin/entrypoint.sh + +ENTRYPOINT ["entrypoint.sh"] + +CMD [ "node" ] diff --git a/Makefile b/Makefile index b55a1c5..a943286 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,12 @@ DOCKER_IMAGE_GIT=cubetiq/calpine-node-git DOCKER_IMAGE_NAME=${DOCKER_IMAGE}:16 build: + @echo 'Starting docker build with slim' + docker build -f Dockerfile.slim . -t ${DOCKER_IMAGE}:slim + + @echo 'Starting docker push with slim' + docker push ${DOCKER_IMAGE}:slim + @echo 'Starting docker build' docker build . -t ${DOCKER_IMAGE} @@ -20,10 +26,18 @@ build: .PHONY:build test: + @echo 'Starting docker build with slim' + docker build -f Dockerfile.slim . -t ${DOCKER_IMAGE}:slim + @echo 'Starting docker build' docker build . -t ${DOCKER_IMAGE} + + @echo 'Starting docker run with slim' + docker run --rm -it ${DOCKER_IMAGE}:slim --version + @echo 'Starting docker run' docker run --rm -it ${DOCKER_IMAGE} --version + @echo 'Starting docker run with git' docker run --rm -it ${DOCKER_IMAGE_GIT} --version diff --git a/README.md b/README.md index b1dfb53..b315de2 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ ![Docker Pulls](https://img.shields.io/docker/pulls/cubetiq/calpine-node) - CUBETIQ Alpine OS Linux (Latest) -- Nodejs 16 (16.17.1) -- PNPM 7 (7.19.0) +- Nodejs 16 (16.19.0) +- PNPM 7 (7.20.0) # [Docker Hub](https://hub.docker.com/r/cubetiq/calpine-node)