From a9ae6f095c5fae6aabaab33fbe7822364e25662e Mon Sep 17 00:00:00 2001 From: chbmb Date: Mon, 3 Jun 2019 00:13:31 +0100 Subject: [PATCH] Fix armhf & aarch --- Dockerfile | 4 ++++ Dockerfile.aarch64 | 20 +++++++++++++++++--- Dockerfile.armhf | 28 +++++++++++++++++++--------- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7495412..c59f597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,10 @@ RUN \ pip install --no-cache-dir -U -r \ optional-requirements.txt && \ echo "**** cleanup ****" && \ + apt-get -y remove \ + git \ + python-pip && \ + apt-get -y autoremove && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f4870ff..2785b24 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -11,8 +11,15 @@ RUN \ echo "**** install build packages ****" && \ apt-get update && \ apt-get install -y \ + g++ \ + gcc \ git \ - python-pip && \ + libffi-dev \ + libjpeg-dev \ + libxml2-dev \ + libxslt1-dev \ + python-pip \ + zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y \ imagemagick \ @@ -37,8 +44,15 @@ RUN \ optional-requirements.txt && \ echo "**** cleanup ****" && \ apt-get -y remove \ - git \ - python-pip && \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libxml2-dev \ + libxslt1-dev \ + python-pip \ + zlib1g-dev && \ apt-get -y autoremove && \ rm -rf \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d84dfa3..d947a2a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -11,8 +11,15 @@ RUN \ echo "**** install build packages ****" && \ apt-get update && \ apt-get install -y \ + g++ \ + gcc \ git \ - python-pip && \ + libffi-dev \ + libjpeg-dev \ + libxml2-dev \ + libxslt1-dev \ + python-pip \ + zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y \ imagemagick \ @@ -37,15 +44,18 @@ RUN \ optional-requirements.txt && \ echo "**** cleanup ****" && \ apt-get -y remove \ - git \ - python-pip && \ - apt-get -y autoremove && \ + g++ \ + gcc \ + git \ + libffi-dev \ + libjpeg-dev \ + libxml2-dev \ + libxslt1-dev \ + python-pip \ + zlib1g-dev && \ + apt-get -y autoremove && \ rm -rf \ /tmp/* # add local files -COPY root/ / - -# ports and volumes -EXPOSE 8083 -VOLUME /books /config \ No newline at end of file +COPY root/ / \ No newline at end of file