From e57c1dc246e08cf3573895bc99e24d515ebe2229 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Thu, 9 Sep 2021 19:48:02 -0400 Subject: [PATCH] forgot other arches --- Dockerfile.aarch64 | 70 ++++++++++++++++++++++++---------------------- Dockerfile.armhf | 70 ++++++++++++++++++++++++---------------------- 2 files changed, 72 insertions(+), 68 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e634b59..7f88bd9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,40 +12,42 @@ ENV HOME="/app" ENV NODE_ENV="production" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache \ - alpine-base \ - git \ - nodejs \ - npm \ - openssh && \ - apk add --no-cache --virtual=build-dependencies \ - curl \ - g++ \ - make \ - python3 && \ - echo "**** symlink python3 for compatibility ****" && \ - ln -s /usr/bin/python3 /usr/bin/python && \ - echo "**** install wiki.js ****" && \ - mkdir -p /app/wiki && \ - if [ -z ${WIKIJS_RELEASE} ]; then \ - WIKIJS_RELEASE=$(curl -sX GET "https://api.github.com/repos/Requarks/wiki/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/wiki.tar.gz -L \ - "https://github.com/Requarks/wiki/releases/download/${WIKIJS_RELEASE}/wiki-js.tar.gz" && \ - tar xf \ - /tmp/wiki.tar.gz -C \ - /app/wiki/ && \ - cd /app/wiki && \ - npm rebuild sqlite3 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache \ + alpine-base \ + git \ + nodejs \ + npm \ + openssh && \ + apk add --no-cache --virtual=build-dependencies \ + curl \ + g++ \ + make \ + python3 && \ + echo "**** symlink python3 for compatibility ****" && \ + ln -s /usr/bin/python3 /usr/bin/python && \ + echo "**** install wiki.js ****" && \ + mkdir -p /app/wiki && \ + if [ -z ${WIKIJS_RELEASE} ]; then \ + WIKIJS_RELEASE=$(curl -sX GET "https://api.github.com/repos/Requarks/wiki/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/wiki.tar.gz -L \ + "https://github.com/Requarks/wiki/releases/download/${WIKIJS_RELEASE}/wiki-js.tar.gz" && \ + tar xf \ + /tmp/wiki.tar.gz -C \ + /app/wiki/ && \ + cd /app/wiki && \ + npm rebuild sqlite3 && \ + echo "**** overlay-fs bug workaround ****" && \ + mv /app /app-tmp && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 295e573..73058a8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,40 +12,42 @@ ENV HOME="/app" ENV NODE_ENV="production" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache \ - alpine-base \ - git \ - nodejs \ - npm \ - openssh && \ - apk add --no-cache --virtual=build-dependencies \ - curl \ - g++ \ - make \ - python3 && \ - echo "**** symlink python3 for compatibility ****" && \ - ln -s /usr/bin/python3 /usr/bin/python && \ - echo "**** install wiki.js ****" && \ - mkdir -p /app/wiki && \ - if [ -z ${WIKIJS_RELEASE} ]; then \ - WIKIJS_RELEASE=$(curl -sX GET "https://api.github.com/repos/Requarks/wiki/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/wiki.tar.gz -L \ - "https://github.com/Requarks/wiki/releases/download/${WIKIJS_RELEASE}/wiki-js.tar.gz" && \ - tar xf \ - /tmp/wiki.tar.gz -C \ - /app/wiki/ && \ - cd /app/wiki && \ - npm rebuild sqlite3 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache \ + alpine-base \ + git \ + nodejs \ + npm \ + openssh && \ + apk add --no-cache --virtual=build-dependencies \ + curl \ + g++ \ + make \ + python3 && \ + echo "**** symlink python3 for compatibility ****" && \ + ln -s /usr/bin/python3 /usr/bin/python && \ + echo "**** install wiki.js ****" && \ + mkdir -p /app/wiki && \ + if [ -z ${WIKIJS_RELEASE} ]; then \ + WIKIJS_RELEASE=$(curl -sX GET "https://api.github.com/repos/Requarks/wiki/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/wiki.tar.gz -L \ + "https://github.com/Requarks/wiki/releases/download/${WIKIJS_RELEASE}/wiki-js.tar.gz" && \ + tar xf \ + /tmp/wiki.tar.gz -C \ + /app/wiki/ && \ + cd /app/wiki && \ + npm rebuild sqlite3 && \ + echo "**** overlay-fs bug workaround ****" && \ + mv /app /app-tmp && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # copy local files COPY root/ /