From d7873c9d117fbb0f80334a875e2abdded91a7643 Mon Sep 17 00:00:00 2001 From: robonau <30987265+Robonau@users.noreply.github.com> Date: Mon, 5 Feb 2024 05:19:22 +0000 Subject: [PATCH] swap docker build to node for multi arch --- .github/workflows/build.yml | 2 +- Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 031aee62..dcea34a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v5 with: - platforms: linux/amd64, linux/arm64 + platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6, linux/arm64, linux/ppc64le, linux/s390x context: . build-args: version=${{ needs.GenTag.outputs.value }} push: true diff --git a/Dockerfile b/Dockerfile index 2819bde6..0a540476 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # develop stage -FROM oven/bun:1.0.25-alpine as develop-stage +FROM node:lts-alpine as develop-stage WORKDIR /app COPY . . ARG version="DevBuild" @@ -7,8 +7,8 @@ RUN sed -i "s@BUILD_VERSION_PLACEHOLDER@${version}@" ./src/app.html # RUN sed -i "s@TRACKING_PLACEHOLDER@docker@" ./src/app.html # build stage FROM develop-stage as build-stage -RUN bun install -RUN bun run build +RUN npm install +RUN npm run build # production stage FROM ghcr.io/nginxinc/nginx-unprivileged:1.25.3-alpine-slim as production-stage USER root