From ac65a0b9d2922de3ec99dbf45294dad852c076ce Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Wed, 1 Jun 2022 21:54:55 +0200 Subject: [PATCH] Fix arm/v7 build --- package.json | 2 +- packages/system-api/Dockerfile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7e09a71a..2df5a3e3 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "test": "jest", "prepare": "husky install", "act:test-install": "act --container-architecture linux/amd64 -j test-install", - "act:docker": "act --container-architecture linux/amd64 --secret-file github.secrets -j docker", + "act:docker": "act --container-architecture linux/amd64 --secret-file github.secrets -j build-images", "start:dev": "docker-compose -f docker-compose.dev.yml --env-file .env.dev up --build", "start:rc": "docker-compose -f docker-compose.rc.yml --env-file .env up --build", "start:prod": "docker-compose --env-file .env up --build" diff --git a/packages/system-api/Dockerfile b/packages/system-api/Dockerfile index 1f101cdb..639472c5 100644 --- a/packages/system-api/Dockerfile +++ b/packages/system-api/Dockerfile @@ -10,6 +10,9 @@ RUN apt-get update && apt-get install -y \ gnupg \ lsb-release +RUN apt-get install -y \ + g++ gcc make python + RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg RUN echo \ @@ -20,8 +23,9 @@ RUN apt-get update RUN apt-get install -y docker-ce docker-ce-cli containerd.io # Install node -RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN apt-get install -y nodejs +RUN npm install --quiet node-gyp -g # Install docker-compose RUN curl -L "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose