From 976464afc77939a2929dcc1355b973d4217342f5 Mon Sep 17 00:00:00 2001 From: selim13 Date: Mon, 6 Feb 2017 18:58:02 +0300 Subject: [PATCH] Refactor Dockerfiles to use curl instead of ADD --- 3.1-apache/Dockerfile | 8 ++++---- 3.2-apache/Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3.1-apache/Dockerfile b/3.1-apache/Dockerfile index e04f295..fc76751 100644 --- a/3.1-apache/Dockerfile +++ b/3.1-apache/Dockerfile @@ -28,13 +28,13 @@ ENV PHPBB_SHA256 '198fda1a0bd833d42e0d4f4fe26a47d656a6e087ed9a561e06b0940de131a2 WORKDIR /tmp -ADD https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2 phpbb.tar.bz2 -RUN echo "${PHPBB_SHA256} phpbb.tar.bz2" | sha256sum -c - \ +RUN curl -SL https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2 -o phpbb.tar.bz2 \ + && echo "${PHPBB_SHA256} phpbb.tar.bz2" | sha256sum -c - \ && tar -xjf phpbb.tar.bz2 \ && mkdir /phpbb \ && mkdir /phpbb/sqlite \ - && mv phpBB3 /phpbb/www -RUN rm -f phpbb.tar.bz2 + && mv phpBB3 /phpbb/www \ + && rm -f phpbb.tar.bz2 COPY phpbb/config.php /phpbb/www diff --git a/3.2-apache/Dockerfile b/3.2-apache/Dockerfile index 88a15e0..544181b 100644 --- a/3.2-apache/Dockerfile +++ b/3.2-apache/Dockerfile @@ -29,13 +29,13 @@ ENV PHPBB_SHA256 '610d960b6e050b205b7248dea366c63bf1feee0551170c75fa4ecbacd5213a WORKDIR /tmp -ADD https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2 phpbb.tar.bz2 -RUN echo "${PHPBB_SHA256} phpbb.tar.bz2" | sha256sum -c - \ +RUN curl -SL https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2 -o phpbb.tar.bz2 \ + && echo "${PHPBB_SHA256} phpbb.tar.bz2" | sha256sum -c - \ && tar -xjf phpbb.tar.bz2 \ && mkdir /phpbb \ && mkdir /phpbb/sqlite \ - && mv phpBB3 /phpbb/www -RUN rm -f phpbb.tar.bz2 + && mv phpBB3 /phpbb/www \ + && rm -f phpbb.tar.bz2 COPY phpbb/config.php /phpbb/www