From 37e2b871a0c6edb2bd72cc6335e843e37a694aff Mon Sep 17 00:00:00 2001 From: trivernis Date: Wed, 2 Dec 2020 11:35:14 +0100 Subject: [PATCH 1/3] Add master branch to push hooks Signed-off-by: trivernis --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5dc27e0..d15e50d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: Build Docker Image on: push: - branches: [ main ] + branches: [ main, master ] workflow_dispatch: jobs: From d3719acfcf11727a249d35d77485ffe2681b42db Mon Sep 17 00:00:00 2001 From: trivernis Date: Wed, 2 Dec 2020 11:49:01 +0100 Subject: [PATCH 2/3] Add alpine build-base package to Dockerfile Signed-off-by: trivernis --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ca613e..a4bc160 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:14.14.0-alpine3.10 AS builder WORKDIR / COPY package.json package-lock.json ./ -RUN apk add --no-cache python3 +RUN apk add --no-cache python3 build-base RUN npm install && npm install -g @angular/cli && mkdir frontend RUN mv node_modules ./frontend WORKDIR /frontend From c35500ba7fc2a5f6276e801cafffb86bd708efc0 Mon Sep 17 00:00:00 2001 From: trivernis Date: Wed, 2 Dec 2020 12:34:50 +0100 Subject: [PATCH 3/3] Remove multiarch Signed-off-by: trivernis --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d15e50d..881ac7f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,7 +31,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm/v7,linux/arm64 + platforms: linux/amd64 push: true tags: | flotte-docker-registry.spdns.org/frontend-server:latest