Avoid repeating common path
Use common path on entrypoint
This commit is contained in:
AlMaVizca
parent
4803e40043
commit
3a25ca5d71
|
|
@ -38,7 +38,7 @@ FROM baseimage
|
|||
# Set Apache ServerName directive globally to suppress AH00558 message.
|
||||
RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
|
||||
|
||||
# Install and enable geos.
|
||||
# Enable PHP dependencies.
|
||||
COPY --from=php-dependencies /usr/local/lib/php/extensions/ /usr/local/lib/php/extensions/
|
||||
RUN docker-php-ext-enable geos bcmath
|
||||
|
||||
|
|
@ -63,12 +63,12 @@ ENV COMPOSER_MEMORY_LIMIT=-1
|
|||
COPY build-farmOS.sh /usr/local/bin/
|
||||
RUN chmod a+x /usr/local/bin/build-farmOS.sh
|
||||
|
||||
# Build the farmOS codebase in /var/farmoS with the --no-dev flag.
|
||||
# Change the ownership of the sites directory and copy the farmOS codebase into /opt/drupal.
|
||||
RUN mkdir /var/farmOS \
|
||||
# Build the farmOS codebase in ${FARMOS_PATH} with the --no-dev flag.
|
||||
# Change the ownership of the sites directory and copy the farmOS codebase into /${DRUPAL_PATH}.
|
||||
RUN mkdir ${FARMOS_PATH} \
|
||||
&& /usr/local/bin/build-farmOS.sh --no-dev \
|
||||
&& chown -R www-data:www-data /var/farmOS/web/sites \
|
||||
&& rm -r /opt/drupal && cp -rp /var/farmOS /opt/drupal
|
||||
&& chown -R www-data:www-data ${FARMOS_PATH}/web/sites \
|
||||
&& rm -r ${DRUPAL_PATH} && cp -rp ${FARMOS_PATH} ${DRUPAL_PATH}
|
||||
|
||||
# Set the entrypoint.
|
||||
COPY docker-entrypoint.sh /usr/local/bin/
|
||||
|
|
|
|||
|
|
@ -2,16 +2,17 @@
|
|||
set -e
|
||||
|
||||
###
|
||||
# This script will build the farmOS codebase in /var/farmOS.
|
||||
# This script will build the farmOS codebase in ${FARMOS_PATH},
|
||||
# by default it is /var/farmOS.
|
||||
###
|
||||
|
||||
# If /var/farmOS is not empty, bail.
|
||||
if [ "$(ls -A /var/farmOS/)" ]; then
|
||||
# If ${FARMOS_PATH} is not empty, bail.
|
||||
if [ "$(ls -A ${FARMOS_PATH})" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Make /var/farmOS the working directory.
|
||||
cd /var/farmOS
|
||||
# Make ${FARMOS_PATH} the working directory.
|
||||
cd ${FARMOS_PATH}
|
||||
|
||||
# Generate an empty Composer project project and checkout a specific version.
|
||||
git clone ${PROJECT_REPO} project
|
||||
|
|
@ -70,7 +71,7 @@ else
|
|||
fi
|
||||
|
||||
# Set the version in farm.info.yml.
|
||||
sed -i "s|version: 3.x|version: ${FARMOS_VERSION}|g" /var/farmOS/web/profiles/farm/farm.info.yml
|
||||
sed -i "s|version: 3.x|version: ${FARMOS_VERSION}|g" ${FARMOS_PATH}/web/profiles/farm/farm.info.yml
|
||||
|
||||
# Remove the Composer cache directory.
|
||||
rm -rf "$COMPOSER_HOME"
|
||||
|
|
|
|||
|
|
@ -24,40 +24,40 @@ COPY conf.d/ /usr/local/etc/php/conf.d
|
|||
ARG WWW_DATA_ID=1000
|
||||
RUN usermod -u ${WWW_DATA_ID} www-data && groupmod -g ${WWW_DATA_ID} www-data
|
||||
|
||||
# Create a fresh /var/farmOS directory owned by www-data.
|
||||
# Create a fresh ${FARMOS_PATH} directory owned by www-data.
|
||||
# We do this in two steps because of a known issue with Moby.
|
||||
# @see https://github.com/farmOS/farmOS/pull/440
|
||||
RUN rm -r /var/farmOS
|
||||
RUN mkdir /var/farmOS && chown www-data:www-data /var/farmOS
|
||||
RUN rm -r ${FARMOS_PATH}
|
||||
RUN mkdir ${FARMOS_PATH} && chown www-data:www-data ${FARMOS_PATH}
|
||||
|
||||
# Change to the www-data user.
|
||||
USER www-data
|
||||
|
||||
# Build the farmOS codebase in /var/farmOS.
|
||||
# Build the farmOS codebase in ${FARMOS_PATH}.
|
||||
RUN /usr/local/bin/build-farmOS.sh
|
||||
|
||||
# Add Configurartions for PHP CodeSniffer, PHPStan.
|
||||
COPY --chown=www-data ./files/ /var/farmOS/
|
||||
COPY --chown=www-data ./files/ ${FARMOS_PATH}/
|
||||
|
||||
# Configure PHPUnit.
|
||||
RUN cp -p /var/farmOS/web/core/phpunit.xml.dist /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|bootstrap="tests/bootstrap.php"|bootstrap="web/core/tests/bootstrap.php"|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i '/failOnWarning="true"/a \ failOnIncomplete="true"' /var/farmOS/phpunit.xml \
|
||||
&& sed -i '/failOnWarning="true"/a \ failOnSkipped="true"' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|name="SIMPLETEST_BASE_URL" value=""|name="SIMPLETEST_BASE_URL" value="http://www"|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|name="SIMPLETEST_DB" value=""|name="SIMPLETEST_DB" value="pgsql://farm:farm@db/farm"|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|name="BROWSERTEST_OUTPUT_DIRECTORY" value=""|name="BROWSERTEST_OUTPUT_DIRECTORY" value="/var/www/html/sites/simpletest/browser_output"|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|name="MINK_DRIVER_ARGS_WEBDRIVER" value='\'''\''|name="MINK_DRIVER_ARGS_WEBDRIVER" value='\''["chrome", { "chromeOptions": { "w3c": false, "args": ["--disable-gpu","--headless", "--no-sandbox"] } }, "http://chrome:4444/wd/hub"]'\''|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|\./|\./web/core/|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's|\.\./web/core/|\./web/|g' /var/farmOS/phpunit.xml \
|
||||
&& sed -i 's| </php>| <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>'"\n"' </php>|g' /var/farmOS/phpunit.xml \
|
||||
&& mkdir -p /var/farmOS/web/sites/simpletest/browser_output
|
||||
RUN cp -p ${FARMOS_PATH}/web/core/phpunit.xml.dist ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|bootstrap="tests/bootstrap.php"|bootstrap="web/core/tests/bootstrap.php"|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i '/failOnWarning="true"/a \ failOnIncomplete="true"' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i '/failOnWarning="true"/a \ failOnSkipped="true"' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|name="SIMPLETEST_BASE_URL" value=""|name="SIMPLETEST_BASE_URL" value="http://www"|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|name="SIMPLETEST_DB" value=""|name="SIMPLETEST_DB" value="pgsql://farm:farm@db/farm"|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|name="BROWSERTEST_OUTPUT_DIRECTORY" value=""|name="BROWSERTEST_OUTPUT_DIRECTORY" value="/var/www/html/sites/simpletest/browser_output"|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|name="MINK_DRIVER_ARGS_WEBDRIVER" value='\'''\''|name="MINK_DRIVER_ARGS_WEBDRIVER" value='\''["chrome", { "chromeOptions": { "w3c": false, "args": ["--disable-gpu","--headless", "--no-sandbox"] } }, "http://chrome:4444/wd/hub"]'\''|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|\./|\./web/core/|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's|\.\./web/core/|\./web/|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& sed -i 's| </php>| <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>'"\n"' </php>|g' ${FARMOS_PATH}/phpunit.xml \
|
||||
&& mkdir -p ${FARMOS_PATH}/web/sites/simpletest/browser_output
|
||||
|
||||
# Change back to the root user.
|
||||
USER root
|
||||
|
||||
# Copy the farmOS codebase into /opt/drupal.
|
||||
RUN rm -r /opt/drupal && cp -rp /var/farmOS /opt/drupal
|
||||
# Copy the farmOS codebase into ${DRUPAL_PATH}.
|
||||
RUN rm -r ${DRUPAL_PATH} && cp -rp ${FARMOS_PATH} ${DRUPAL_PATH}
|
||||
|
||||
# Create a Composer config directory for the www-data user.
|
||||
RUN mkdir /var/www/.composer && chown www-data:www-data /var/www/.composer
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@ set -e
|
|||
###
|
||||
|
||||
# If the Drupal directory is empty, populate it from pre-built files.
|
||||
if [ -d /opt/drupal ] && ! [ "$(ls -A /opt/drupal/)" ]; then
|
||||
if [ -d ${DRUPAL_PATH} ] && ! [ "$(ls -A ${DRUPAL_PATH}/)" ]; then
|
||||
echo "farmOS codebase not detected. Copying from pre-built files in the Docker image."
|
||||
cp -rp /var/farmOS/. /opt/drupal
|
||||
cp -rp ${FARMOS_PATH}/. ${DRUPAL_PATH}
|
||||
fi
|
||||
|
||||
# If the sites directory is empty, populate it from pre-built files.
|
||||
if [ -d /opt/drupal/web/sites ] && ! [ "$(ls -A /opt/drupal/web/sites/)" ]; then
|
||||
if [ -d ${DRUPAL_PATH}/web/sites ] && ! [ "$(ls -A ${DRUPAL_PATH}/web/sites/)" ]; then
|
||||
echo "farmOS sites directory not detected. Copying from pre-built files in the Docker image."
|
||||
cp -rp /var/farmOS/web/sites/. /opt/drupal/web/sites
|
||||
cp -rp ${FARMOS_PATH}/web/sites/. ${DRUPAL_PATH}/web/sites
|
||||
fi
|
||||
|
||||
if [ -n "$FARMOS_FS_READY_SENTINEL_FILENAME" ]; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue