From 94af6befd0a9bd679c9c162856f1a4b731db99a6 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Wed, 2 Dec 2020 11:27:51 +0100
Subject: [PATCH] Remove multiarch and add python to Dockerfile

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .github/workflows/docker.yml | 8 +-------
 Dockerfile                   | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a237e61..ed87270 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,12 +12,6 @@ jobs:
 
       - name: Copy Repo Files
         uses: actions/checkout@master
-      -
-        name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-          architecture: 'x64'
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -37,7 +31,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64 #,linux/arm/v7,linux/arm64
           push: true
           tags: |
             flotte-docker-registry.spdns.org/frontend-server:latest
diff --git a/Dockerfile b/Dockerfile
index a33ada4..9ca613e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +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 npm install && npm install -g @angular/cli && mkdir frontend
 RUN mv node_modules ./frontend
 WORKDIR /frontend
@@ -12,7 +13,7 @@ FROM golang:1.13.4-alpine as builder2
 ARG ARCH=amd64
 RUN apk add git
 WORKDIR /
-COPY --from=builder /frontend/dist /dist 
+COPY --from=builder /frontend/dist /dist
 RUN go get github.com/rakyll/statik
 RUN statik --src=/dist/flotte-frontend
 COPY *.go *.sum *.mod /