fixed merge conflict

build-scripts/web/Dockerfile

@@ -38,6 +38,8 @@ RUN echo "mysql-server mysql-server/root_password_again password root" | debconf
 RUN apt-get update && \
     apt-get install --assume-yes \
     apache2 \
+    nano \
+    yarn \
     openssh-server \
     wget \
     sudo \
@@ -79,7 +81,6 @@ RUN openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout /tmp/apache.key
 RUN cp /tmp/apache.crt /etc/ssl/certs/server.crt
 RUN cp /tmp/apache.key /etc/ssl/private/server.key
 
-
 # Replace the default site configuration with our own.
 COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
 
@@ -89,15 +90,15 @@ RUN a2enmod rewrite
 # Enable SSL
 RUN a2enmod ssl
 
-## for Content Security Policy (CSP).
+# for Content Security Policy (CSP).
 RUN a2enmod headers
 
-## Install the latest npm and gulp so we have them for responsive sites.
+# Install the latest npm and gulp so we have them for responsive sites.
 RUN sudo npm install npm@latest -g \
     sudo npm install gulp -g \
     sudo npm install bower -g
 
-## Create a symlink for node to nodejs.
+# Create a symlink for node to nodejs.
 ## RUN ln -s /usr/bin/nodejs /usr/bin/node
 
 

build-scripts/web/docker-entrypoint.sh

@@ -24,13 +24,14 @@ if [ -n "$APACHE_DOCROOT_DIR" ]; then
 fi
 
 # Allow the site name to be overriden.
-APACHE_SITE_NAME="${APACHE_SITE_NAME:docker8}"
+APACHE_SITE_NAME="${APACHE_SITE_NAME:-docker8}"
 if [ -n "$APACHE_SITE_NAME" ]; then
      sed -i 's@^\s*ServerName.*@'"        ServerName ${APACHE_SITE_NAME}"'@'  /etc/apache2/sites-available/000-default.conf
 fi
 
 # Allow for site aliases to be provided.
-APACHE_SITE_ALIAS="${APACHE_SITE_ALIAS:docke8.localhost}"
+APACHE_SITE_ALIAS="${APACHE_SITE_ALIAS:-docker8.localhost}"
+
 if [ -n "$APACHE_SITE_ALIAS" ]; then
      sed -i 's@^\s*ServerAlias.*@'"        ServerAlias ${APACHE_SITE_ALIAS}"'@'  /etc/apache2/sites-available/000-default.conf
 fi