From 2e4ef3b22475349af35d2d8be39f69bd500aeb72 Mon Sep 17 00:00:00 2001 From: Tzahi12345 Date: Tue, 18 Aug 2020 16:43:52 -0400 Subject: [PATCH] Moves hooks back into their proper directory and updated arm dockerfile to avoid installing curl just go get qemu --- armhf.Dockerfile | 7 ++----- {backend/hooks => hooks}/post_checkout | 0 {backend/hooks => hooks}/pre_build | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename {backend/hooks => hooks}/post_checkout (100%) rename {backend/hooks => hooks}/pre_build (100%) diff --git a/armhf.Dockerfile b/armhf.Dockerfile index 0f7acf5..8e64259 100644 --- a/armhf.Dockerfile +++ b/armhf.Dockerfile @@ -1,13 +1,10 @@ FROM arm32v7/alpine:3.12 as frontend RUN apk add --no-cache \ - npm \ - curl + npm RUN npm install -g @angular/cli -RUN curl -L https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz | tar zxvf - -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . - WORKDIR /build COPY [ "package.json", "package-lock.json", "/build/" ] RUN npm install @@ -20,7 +17,7 @@ RUN ng build --prod FROM arm32v7/alpine:3.12 -COPY --from=frontend /qemu-arm-static /usr/bin +COPY qemu-arm-static /usr/bin ENV UID=1000 \ GID=1000 \ diff --git a/backend/hooks/post_checkout b/hooks/post_checkout similarity index 100% rename from backend/hooks/post_checkout rename to hooks/post_checkout diff --git a/backend/hooks/pre_build b/hooks/pre_build similarity index 100% rename from backend/hooks/pre_build rename to hooks/pre_build