From 9f5cb398954bb9c145155fc20955de5a8daf2d92 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Sat, 5 Feb 2022 15:22:08 -0500 Subject: [PATCH] added make, fixed formatting --- Dockerfile | 81 +++++++++++++++++++++++----------------------- Dockerfile.aarch64 | 81 +++++++++++++++++++++++----------------------- Dockerfile.armhf | 81 +++++++++++++++++++++++----------------------- 3 files changed, 123 insertions(+), 120 deletions(-) diff --git a/Dockerfile b/Dockerfile index 064e915..43ec037 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,46 +8,47 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="alex-phillips" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - curl \ - python3 && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - nodejs \ - npm \ - sqlite && \ - echo "**** install budge ****" && \ - mkdir -p /app/budge && \ - if [ -z ${NOTEMARKS_RELEASE+x} ]; then \ - BUDGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/BudgE/commits/main" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/budge.tar.gz -L \ - "https://github.com/linuxserver/BudgE/archive/${BUDGE_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/budge.tar.gz -C \ - /app/budge/ --strip-components=1 && \ - echo "**** install backend ****" && \ - cd /app/budge/backend && \ - npm i && \ - npm run build && \ - npm prune --production && \ - echo "**** install ynab importer ****" && \ - cd /app/budge/ynab && \ - npm i && \ - echo "**** install frontend ****" && \ - cd /app/budge/frontend && \ - npm i && \ - npm run build && \ - npm prune --production && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + curl \ + make \ + python3 && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + nodejs \ + npm \ + sqlite && \ + echo "**** install budge ****" && \ + mkdir -p /app/budge && \ + if [ -z ${NOTEMARKS_RELEASE+x} ]; then \ + BUDGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/BudgE/commits/main" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/budge.tar.gz -L \ + "https://github.com/linuxserver/BudgE/archive/${BUDGE_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/budge.tar.gz -C \ + /app/budge/ --strip-components=1 && \ + echo "**** install backend ****" && \ + cd /app/budge/backend && \ + npm i && \ + npm run build && \ + npm prune --production && \ + echo "**** install ynab importer ****" && \ + cd /app/budge/ynab && \ + npm i && \ + echo "**** install frontend ****" && \ + cd /app/budge/frontend && \ + npm i && \ + npm run build && \ + npm prune --production && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a52bc7e..43ec037 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,46 +8,47 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="alex-phillips" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - curl \ - python3 && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - nodejs \ - npm \ - sqlite && \ - echo "**** install budge ****" && \ - mkdir -p /app/budge && \ - if [ -z ${NOTEMARKS_RELEASE+x} ]; then \ - BUDGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/BudgE/commits/main" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/budge.tar.gz -L \ - "https://github.com/linuxserver/BudgE/archive/${BUDGE_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/budge.tar.gz -C \ - /app/budge/ --strip-components=1 && \ - echo "**** install backend ****" && \ - cd /app/budge/backend && \ - npm i && \ - npm run build && \ - npm prune --production && \ - echo "**** install ynab importer ****" && \ - cd /app/budge/ynab && \ - npm i && \ - echo "**** install frontend ****" && \ - cd /app/budge/frontend && \ - npm i && \ - npm run build && \ - npm prune --production && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + curl \ + make \ + python3 && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + nodejs \ + npm \ + sqlite && \ + echo "**** install budge ****" && \ + mkdir -p /app/budge && \ + if [ -z ${NOTEMARKS_RELEASE+x} ]; then \ + BUDGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/BudgE/commits/main" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/budge.tar.gz -L \ + "https://github.com/linuxserver/BudgE/archive/${BUDGE_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/budge.tar.gz -C \ + /app/budge/ --strip-components=1 && \ + echo "**** install backend ****" && \ + cd /app/budge/backend && \ + npm i && \ + npm run build && \ + npm prune --production && \ + echo "**** install ynab importer ****" && \ + cd /app/budge/ynab && \ + npm i && \ + echo "**** install frontend ****" && \ + cd /app/budge/frontend && \ + npm i && \ + npm run build && \ + npm prune --production && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 44758b8..427c421 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,46 +8,47 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="alex-phillips" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - curl \ - python3 && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - nodejs \ - npm \ - sqlite && \ - echo "**** install budge ****" && \ - mkdir -p /app/budge && \ - if [ -z ${NOTEMARKS_RELEASE+x} ]; then \ - BUDGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/BudgE/commits/main" \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/budge.tar.gz -L \ - "https://github.com/linuxserver/BudgE/archive/${BUDGE_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/budge.tar.gz -C \ - /app/budge/ --strip-components=1 && \ - echo "**** install backend ****" && \ - cd /app/budge/backend && \ - npm i && \ - npm run build && \ - npm prune --production && \ - echo "**** install ynab importer ****" && \ - cd /app/budge/ynab && \ - npm i && \ - echo "**** install frontend ****" && \ - cd /app/budge/frontend && \ - npm i && \ - npm run build && \ - npm prune --production && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + curl \ + make \ + python3 && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + nodejs \ + npm \ + sqlite && \ + echo "**** install budge ****" && \ + mkdir -p /app/budge && \ + if [ -z ${NOTEMARKS_RELEASE+x} ]; then \ + BUDGE_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/BudgE/commits/main" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/budge.tar.gz -L \ + "https://github.com/linuxserver/BudgE/archive/${BUDGE_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/budge.tar.gz -C \ + /app/budge/ --strip-components=1 && \ + echo "**** install backend ****" && \ + cd /app/budge/backend && \ + npm i && \ + npm run build && \ + npm prune --production && \ + echo "**** install ynab importer ****" && \ + cd /app/budge/ynab && \ + npm i && \ + echo "**** install frontend ****" && \ + cd /app/budge/frontend && \ + npm i && \ + npm run build && \ + npm prune --production && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ /