William/Docker_Grav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only the 'user' directory of Grav will be moved and copied when needed now

Browse Source
This commit is contained in:
William Miceli
2019-08-20 13:53:24 -04:00
parent b92bb4aa21
commit 7379ba98b1
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@@ -38,16 +38,17 @@ RUN sed -i 's/root \/home\/USER\/www\/html/root \/var\/www/g' /etc/nginx/conf.d/
RUN (crontab -u nginx -l; echo "* * * * * cd /var/www;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -u nginx - RUN (crontab -u nginx -l; echo "* * * * * cd /var/www;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -u nginx -
# Prepare Grav Files # Prepare Grav Files
RUN mkdir -p /var/www /usr/src/grav \ RUN mkdir -p /var/www /usr/src/grav/user \
&& apk add --no-cache ca-certificates \ && apk add --no-cache ca-certificates \
&& apk add --no-cache --virtual .install-dependencies unzip wget \ && apk add --no-cache --virtual .install-dependencies unzip wget \
&& wget -P /usr/src/grav https://github.com/getgrav/grav/releases/download/${GRAV_VERSION}/grav-admin-v${GRAV_VERSION}.zip \ && wget -P /var/www https://github.com/getgrav/grav/releases/download/${GRAV_VERSION}/grav-admin-v${GRAV_VERSION}.zip \
&& unzip -q /usr/src/grav/grav-admin-v${GRAV_VERSION}.zip -d /usr/src/grav \ && unzip -q /var/www/grav-admin-v${GRAV_VERSION}.zip -d /var/www \
&& rm /usr/src/grav/grav-admin-v${GRAV_VERSION}.zip \ && rm /var/www/grav-admin-v${GRAV_VERSION}.zip \
&& mv -v /usr/src/grav/grav-admin/* /usr/src/grav \ && mv -v /var/www/grav-admin/* /var/www \
&& rm -rfv /usr/src/grav/grav-admin \ && rm -rfv /var/www/grav-admin \
&& apk del .install-dependencies \ && apk del .install-dependencies \
&& chown -R nginx:nginx /usr/src/grav && chown -R nginx:nginx /var/www \
&& mv -v /var/www/user /usr/src/grav/user
COPY /entrypoint.sh / COPY /entrypoint.sh /

10
entrypoint.sh
View File

@@ -5,18 +5,18 @@ directory_empty() {
[ -z "$(ls -A "$1/")" ] [ -z "$(ls -A "$1/")" ]
} }
# Copy new Grav files into web directory if no 'user' files are already present # Copy Grav 'user' files into /var/www/user if no files are already present
echo "[ INFO ] Checking for any existing 'user' files" echo "[ INFO ] Checking for any existing 'user' files"
if directory_empty "var/www/user" if directory_empty "var/www/user"
then then
echo "[ INFO ] No pre-existing 'user' files found (New instance)" echo "[ INFO ] No pre-existing 'user' files found (New instance)"
echo "[ INFO ] Copying all Grav files into /var/www/" echo "[ INFO ] Copying default Grav 'user' files into /var/www/user"
cp -Ru /usr/src/grav/* /var/www cp -Ru /usr/src/grav/user/* /var/www/user
echo "[ INFO ] Default files have been copied successfully" echo "[ INFO ] Default 'user' files have been copied successfully"
else else
echo "[ INFO ] 'user' directory not empty (Pre-existing instance):" echo "[ INFO ] 'user' directory not empty (Pre-existing instance):"
ls -A /var/www/user/ | cat - ls -A /var/www/user/ | cat -
echo "[ INFO ] Not copying new files" echo "[ INFO ] No 'user' files will be copied"
fi fi
echo "[ INFO ] Recursively setting default nginx:nginx permissions on web directory" echo "[ INFO ] Recursively setting default nginx:nginx permissions on web directory"