diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2446074..d0eae97 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ on: - "main" env: - ALPINE_VERSION: "3.20" + ALPINE_VERSION: "3.22" jobs: docker-build: @@ -21,7 +21,7 @@ jobs: strategy: matrix: - node-version: [14.19.1, 18, 19, 20, 20.13.1, 20.17.0, 22.11.0, 23.4.0] # Node.js versions + node-version: [20.19.5, 22.21.1, 24.11.0, 25.1.0] # Node.js versions steps: - name: Checkout Code diff --git a/Dockerfile b/Dockerfile index cc7a83b..9b5fb5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,11 @@ ARG NODE_VERSION=current ARG ALPINE_VERSION=latest # Base images -FROM node:${NODE_VERSION}-alpine AS node -FROM alpine:${ALPINE_VERSION} +FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS node # Set version variables -ARG DOCKERIZE_VERSION="v0.8.0" -ARG S6_OVERLAY_VERSION="v3.2.0.2" +ARG DOCKERIZE_VERSION="v0.9.6" +ARG S6_OVERLAY_VERSION="v3.2.1.0" ARG S6_OVERLAY_ARCH="x86_64" # Install dependencies and tools @@ -36,12 +35,6 @@ RUN apk add --no-cache \ apk del --purge build-dependencies && \ rm -rf /tmp/* -# Add Node.js libraries from the Node image -COPY --from=node /usr/lib /usr/lib -COPY --from=node /usr/local/lib /usr/local/lib -COPY --from=node /usr/local/include /usr/local/include -COPY --from=node /usr/local/bin /usr/local/bin - # Add S6 Overlay RUN wget -qO- https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz | tar -C / -Jx && \ wget -qO- https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz | tar -C / -Jx && \ diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-node-app/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-node-app/run index 4af8b26..baee128 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/svc-node-app/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/svc-node-app/run @@ -4,4 +4,4 @@ set -e cd /app || exit 1 # start our node.js application -npm start +npm start 2>&1