Tag 4.2.0.

Merge branch 'release/4.2.0'

Author: pingers

docker/Dockerfile

@@ -31,7 +31,7 @@ fi
 
 # Upgrade all currently installed packages and install additional packages.
 RUN apt-get update \
-&& apt-get -y install php-sqlite3 php-xdebug php-cli git wget sudo unzip libnotify-bin vim \
+&& apt-get -y install php-sqlite3 php-xdebug php-cli git wget sudo unzip vim \
 && sed -ri 's/^zend.assertions\s*=\s*-1/zend.assertions = 1/g' /etc/php/${PHP_VERSION}/cli/php.ini \
 && apt-get -y autoremove && apt-get -y autoclean && apt-get clean && rm -rf /var/lib/apt/lists /tmp/* /var/tmp/*
 

dsh

@@ -116,10 +116,10 @@ dsh_project() {
 # Command: ./dsh pull
 # Fetches all images used by the project.
 dsh_pull() {
-  # docker-compose doesn't resolve sub-dependencies in Dockerfiles.
-  docker pull uofa/s2i-shepherd-drupal
+  # docker-compose doesn't resolve sub-dependencies in Dockerfiles and that's ok.
   docker-compose -f ${DOCKER_COMPOSE_FILE} pull --ignore-pull-failures
-  docker-compose -f ${DOCKER_COMPOSE_FILE} build
+  # Check for dependent image updates with --pull before building.
+  docker-compose -f ${DOCKER_COMPOSE_FILE} build --pull
 }
 
 # Command: ./dsh nfs