34
3
mirror of https://github.com/joomla-docker/docker-joomla.git synced 2024-11-18 02:55:13 +00:00

Merge pull request #80 from J0WI/code-style

Consistent code style
This commit is contained in:
Michael Babker 2019-08-05 07:35:16 -05:00 committed by GitHub
commit 023e57ef1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 30 deletions

View File

@ -66,12 +66,13 @@ ENV JOOMLA_VERSION %%VERSION%%
ENV JOOMLA_SHA512 %%SHA512%% ENV JOOMLA_SHA512 %%SHA512%%
# Download package and extract to web volume # Download package and extract to web volume
RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ RUN set -ex; \
&& echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
&& mkdir /usr/src/joomla \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ mkdir /usr/src/joomla; \
&& rm joomla.tar.bz2 \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
&& chown -R www-data:www-data /usr/src/joomla rm joomla.tar.bz2; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts and custom .htaccess # Copy init scripts and custom .htaccess
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh

View File

@ -68,12 +68,13 @@ ENV JOOMLA_VERSION %%VERSION%%
ENV JOOMLA_SHA512 %%SHA512%% ENV JOOMLA_SHA512 %%SHA512%%
# Download package and extract to web volume # Download package and extract to web volume
RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ RUN set -ex; \
&& echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
&& mkdir /usr/src/joomla \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ mkdir /usr/src/joomla; \
&& rm joomla.tar.bz2 \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
&& chown -R www-data:www-data /usr/src/joomla rm joomla.tar.bz2; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts and custom .htaccess # Copy init scripts and custom .htaccess
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh

View File

@ -65,12 +65,13 @@ ENV JOOMLA_VERSION 3.9.10
ENV JOOMLA_SHA512 335b0f15e267c0430bb5eed7ac84bef299602c48f58ab8f4370434c684b956ea4515c5e742b4eb59ffdc9d61fb14618625fd85e81157ee7185097c925bb08708 ENV JOOMLA_SHA512 335b0f15e267c0430bb5eed7ac84bef299602c48f58ab8f4370434c684b956ea4515c5e742b4eb59ffdc9d61fb14618625fd85e81157ee7185097c925bb08708
# Download package and extract to web volume # Download package and extract to web volume
RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ RUN set -ex; \
&& echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
&& mkdir /usr/src/joomla \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ mkdir /usr/src/joomla; \
&& rm joomla.tar.bz2 \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
&& chown -R www-data:www-data /usr/src/joomla rm joomla.tar.bz2; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts and custom .htaccess # Copy init scripts and custom .htaccess
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh

View File

@ -63,12 +63,13 @@ ENV JOOMLA_VERSION 3.9.10
ENV JOOMLA_SHA512 335b0f15e267c0430bb5eed7ac84bef299602c48f58ab8f4370434c684b956ea4515c5e742b4eb59ffdc9d61fb14618625fd85e81157ee7185097c925bb08708 ENV JOOMLA_SHA512 335b0f15e267c0430bb5eed7ac84bef299602c48f58ab8f4370434c684b956ea4515c5e742b4eb59ffdc9d61fb14618625fd85e81157ee7185097c925bb08708
# Download package and extract to web volume # Download package and extract to web volume
RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ RUN set -ex; \
&& echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
&& mkdir /usr/src/joomla \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ mkdir /usr/src/joomla; \
&& rm joomla.tar.bz2 \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
&& chown -R www-data:www-data /usr/src/joomla rm joomla.tar.bz2; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts and custom .htaccess # Copy init scripts and custom .htaccess
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh

View File

@ -64,12 +64,13 @@ ENV JOOMLA_VERSION 3.9.10
ENV JOOMLA_SHA512 335b0f15e267c0430bb5eed7ac84bef299602c48f58ab8f4370434c684b956ea4515c5e742b4eb59ffdc9d61fb14618625fd85e81157ee7185097c925bb08708 ENV JOOMLA_SHA512 335b0f15e267c0430bb5eed7ac84bef299602c48f58ab8f4370434c684b956ea4515c5e742b4eb59ffdc9d61fb14618625fd85e81157ee7185097c925bb08708
# Download package and extract to web volume # Download package and extract to web volume
RUN curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2 \ RUN set -ex; \
&& echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c - \ curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
&& mkdir /usr/src/joomla \ echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
&& tar -xf joomla.tar.bz2 -C /usr/src/joomla \ mkdir /usr/src/joomla; \
&& rm joomla.tar.bz2 \ tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
&& chown -R www-data:www-data /usr/src/joomla rm joomla.tar.bz2; \
chown -R www-data:www-data /usr/src/joomla
# Copy init scripts and custom .htaccess # Copy init scripts and custom .htaccess
COPY docker-entrypoint.sh /entrypoint.sh COPY docker-entrypoint.sh /entrypoint.sh