Remove multiarch and add python to Dockerfile

Signed-off-by: trivernis <trivernis@protonmail.com>
pull/6/head
trivernis 4 years ago
parent 988b4cf7fb
commit 94af6befd0
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45

@ -12,12 +12,6 @@ jobs:
- name: Copy Repo Files - name: Copy Repo Files
uses: actions/checkout@master uses: actions/checkout@master
-
name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
architecture: 'x64'
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v1
@ -37,7 +31,7 @@ jobs:
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
platforms: linux/amd64,linux/arm/v7,linux/arm64 platforms: linux/amd64 #,linux/arm/v7,linux/arm64
push: true push: true
tags: | tags: |
flotte-docker-registry.spdns.org/frontend-server:latest flotte-docker-registry.spdns.org/frontend-server:latest

@ -1,6 +1,7 @@
FROM node:14.14.0-alpine3.10 AS builder FROM node:14.14.0-alpine3.10 AS builder
WORKDIR / WORKDIR /
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN apk add --no-cache python3
RUN npm install && npm install -g @angular/cli && mkdir frontend RUN npm install && npm install -g @angular/cli && mkdir frontend
RUN mv node_modules ./frontend RUN mv node_modules ./frontend
WORKDIR /frontend WORKDIR /frontend
@ -12,7 +13,7 @@ FROM golang:1.13.4-alpine as builder2
ARG ARCH=amd64 ARG ARCH=amd64
RUN apk add git RUN apk add git
WORKDIR / WORKDIR /
COPY --from=builder /frontend/dist /dist COPY --from=builder /frontend/dist /dist
RUN go get github.com/rakyll/statik RUN go get github.com/rakyll/statik
RUN statik --src=/dist/flotte-frontend RUN statik --src=/dist/flotte-frontend
COPY *.go *.sum *.mod / COPY *.go *.sum *.mod /

Loading…
Cancel
Save