From d92dc6cd50edbcca37aed81322730128c67c5533 Mon Sep 17 00:00:00 2001
From: Chris Shantz <mnshantz@uwaterloo.ca>
Date: Wed, 4 Jul 2018 11:09:35 -0400
Subject: [PATCH] Update Dockerfile with nano, yarn.
---
build-scripts/web/Dockerfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/build-scripts/web/Dockerfile b/build-scripts/web/Dockerfile
index 26c1059..6f86dee 100644
--- a/build-scripts/web/Dockerfile
+++ b/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 \
@@ -78,7 +80,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
@@ -88,15 +89,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
--
GitLab