Skip to content

Commit

Permalink
Updated build proc... seems to work locally
Browse files Browse the repository at this point in the history
  • Loading branch information
mrinc committed Dec 22, 2023
1 parent b1289b7 commit 3f768b9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/buildAndPub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ jobs:
build-args: |
NODE_VERSION=${{ matrix.tag }}
context: .
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
push: true
tags: betterweb/node:${{matrix.tag}}
12 changes: 4 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG NODE_VERSION=v20.0.0
ENV PYTHONUNBUFFERED=1

RUN set -eux \
&& echo "Node version: $NODE_VERSION" \
&& echo "Node version: $NODE_VERSION | NP: $(getconf _NPROCESSORS_ONLN)" \
&& addgroup -g 1000 node \
&& adduser -u 1000 -G node -s /bin/sh -D node \
&& apk add --no-cache libstdc++ \
Expand Down Expand Up @@ -95,8 +95,7 @@ RUN set -eux \
&& rm -rf "$GNUPGHOME" \
&& grep " node-$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-$NODE_VERSION.tar.xz" \
&& cd "node-$NODE_VERSION" \
&& ./configure && make -j$(getconf _NPROCESSORS_ONLN) V= && make install \
&& cd "node-$NODE_VERSION" && ./configure && make -j$(getconf _NPROCESSORS_ONLN) V= && make install \
&& apk del .build-deps-full \
&& cd .. \
&& rm -Rf "node-$NODE_VERSION" \
Expand All @@ -109,12 +108,9 @@ RUN set -eux \
&& npm --version

FROM betterweb/alpine:latest

COPY --from=builder /usr/local /usr/local

COPY install_packages.sh /usr/local/bin/
COPY install_packages.sh /usr/local/bin/install_packages
COPY docker-entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh /usr/local/bin/install_packages.sh
RUN chmod +x /entrypoint.sh /usr/local/bin/install_packages
ENTRYPOINT ["/entrypoint.sh"]

CMD [ "node" ]

0 comments on commit 3f768b9

Please sign in to comment.