Skip to content
Snippets Groups Projects
Commit 1773623a authored by Chris Shantz's avatar Chris Shantz
Browse files

Removed web container, replaced with two drupal ones, updated db container and... 

Removed web container, replaced with two drupal ones, updated db container and updated docker-compose.yml.
parent 622aca4c
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
build-scripts/db/Dockerfile
+ 4
− 8
View file @ 1773623a
......@@ -8,15 +8,11 @@ FROM ubuntu:xenial
# #
################################################################################
## Pre-configure mysql username and password
RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections
RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections
# Update the package manager, then install MySQL server.
RUN apt-get update && apt-get install -y mysql-server
# Update the package manager, then install MariaDB server.
RUN apt-get update && apt-get install -y mariadb-server
# Reconfigure the bind address of MySQL to allow any incoming network connection.
RUN sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/mysql.conf.d/mysqld.cnf
RUN sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/mariadb.conf.d/50-server.cnf
# Copy our custom entrypoint and make it executable.
COPY docker-entrypoint.sh /usr/local/bin/
......@@ -32,4 +28,4 @@ EXPOSE 3306
ENTRYPOINT ["docker-entrypoint.sh"]
# If no command is passed to the container, start the MySQL server by default.
CMD ["/usr/bin/mysqld_safe"]
CMD ["/usr/bin/mysqld_safe"]
\ No newline at end of file
build-scripts/db/docker-entrypoint.sh
+ 1
− 1
View file @ 1773623a
......@@ -14,7 +14,7 @@ MYSQL_DATABASE=${MYSQL_DATABASE:-wcms_db}
MYSQL_USER=${MYSQL_USER:-mysql}
MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
ADDITIONAL_DATABASES=${ADDITIONAL_DATABASES:-}
ADDITIONAL_DATABASES=${ADDITIONAL_DATABASES:-fdsu1}
# Start the MySQL server in the background.
mysqld_safe &
......
build-scripts/web/000-default.conf deleted 100644 → 0
+ 0
− 53
View file @ 622aca4c
<VirtualHost *:80>
DocumentRoot /var/www/drupal
ServerAdmin webmaster@localhost
ServerName docker8
Redirect permanent / https://docker8/
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
</VirtualHost>
<VirtualHost *:443>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/drupal
ServerName docker8
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory /var/www/>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
ErrorLog /error.log
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
LogLevel warn
CustomLog /access.log combined
SSLEngine on
SSLCertificateFile /etc/ssl/certs/server.crt
SSLCertificateKeyFile /etc/ssl/private/server.key
Alias /doc/ /usr/share/doc/
<Directory /usr/share/doc/>
Options Indexes MultiViews FollowSymLinks
AllowOverride None
Order deny,allow
Deny from all
Allow from 127.0.0.0/255.0.0.0 ::1/128
</Directory>
</VirtualHost>
\ No newline at end of file
build-scripts/web/Dockerfile deleted 100644 → 0
+ 0
− 161
View file @ 622aca4c
FROM ubuntu:xenial
################################################################################
# #
# THIS CONTAINER IS FOR EDUCATIONAL USE ONLY! #
# #
# Never use this container for running production workloads! #
# #
################################################################################
RUN export DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install --assume-yes \
software-properties-common \
language-pack-en \
curl \
apt-transport-https
## Added so we can install yarn for Drupal8 theme work.
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
## Added so we can installs 8.x branch of nodejs.
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
RUN export LANG=en_US.UTF-8
## For ubuntu xenial we need to add some repos for the latest PHP version
RUN export DEBIAN_FRONTEND=noninteractive
RUN LC_ALL=en_US.UTF-8 add-apt-repository -y ppa:ondrej/php
## Pre-configure mysql username and password
RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections
RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections
# Update the package manager, then install packages.
RUN apt-get update && \
apt-get install --assume-yes \
apache2 \
nano \
openssh-server \
wget \
sudo \
php7.2 \
libapache2-mod-php7.2 \
php7.2-mysql \
php7.2-cli \
php7.2-common \
php7.2-gd \
php7.2-mbstring \
php7.2-xml \
php7.2-opcache \
php7.2-sqlite3 \
php7.2-mysql \
php7.2-curl \
php7.2-soap \
php7.2-phar \
php7.2-cgi \
php-uploadprogress \
php-pear \
optipng \
jpegoptim \
imagemagick \
libapache2-mod-fcgid \
libapache2-mod-fastcgi \
git \
nodejs \
yarn \
ruby-sass \
ruby-compass \
mysql-client
## From https://www.digitalocean.com/community/tutorials/how-to-create-a-ssl-certificate-on-apache-for-ubuntu-14-04
RUN cd /tmp
RUN openssl req -x509 -nodes -days 1825 -newkey rsa:2048 -keyout /tmp/apache.key -out /tmp/apache.crt \
-subj "/C=CA/ST=ON/L=Waterloo/O=uWaterloo/OU=IST/CN=wcms-devsite/emailAddress=localhost@example.com"
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
# Enable mod_rewrite 'cause we needs it.
RUN a2enmod rewrite
# Enable SSL
RUN a2enmod ssl
# for Content Security Policy (CSP).
RUN a2enmod headers
# 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.
## RUN ln -s /usr/bin/nodejs /usr/bin/node
# Install Composer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
# Add the "vagrant" user (because we are all familiar with having it)
RUN useradd -d /home/vagrant -ms /bin/bash -g root -G sudo -p vagrant vagrant
# Forward logs to docker log collector.
RUN ln -sf /dev/stdout /var/log/apache2/access.log && \
ln -sf /dev/stderr /var/log/apache2/error.log && \
ln -sf /dev/stdout /var/log/apache2/000_default-access_log && \
ln -sf /dev/stderr /var/log/apache2/000_default-error_log
# Copy our custom entrypoint and make it executable.
COPY docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
# Clone PatternLab into the html directory.
RUN git clone https://git.uwaterloo.ca/wcms/uw_wcms_pattern_lab.git /var/www/html/uw_wcms_pattern_lab
RUN echo "Cloned patternlab..."
# Add drush 8
RUN wget https://github.com/drush-ops/drush/releases/download/8.1.17/drush.phar && \
chmod +x drush.phar && \
mv drush.phar /usr/local/bin/drush
# Manually set up the apache environment variables
ENV APACHE_RUN_USER www-data
ENV APACHE_RUN_GROUP www-data
ENV APACHE_LOG_DIR /var/log/apache2
ENV APACHE_LOCK_DIR /var/lock/apache2
ENV APACHE_PID_FILE /var/run/apache2.pid
# Clone Drupal
RUN drush dl -v -d drupal-8.5.6 --destination="/var/www" --drupal-project-rename="drupal8"
RUN echo "Cloned Drupal 8...."
# Clone our WCMS profile
RUN cd /var/www/drupal8/profiles && \
git clone https://git.uwaterloo.ca/wcms/uw_base_profile.git && \
cd /var/www/drupal8/profiles/uw_base_profile && \
git checkout 8.x-3.x
# Create the settings.php file
RUN cd /var/www/drupal8/sites/default && \
cp default.settings.php settings.php
# Add Drupal permissions to the drupal folder
RUN chown -R vagrant:www-data /var/www/drupal8
RUN chmod -R g+w /var/www/drupal8
# Expose the default Apache port.
EXPOSE 80
EXPOSE 443
# Replace the standard entrypoint /bin/sh with our script.
ENTRYPOINT ["docker-entrypoint.sh"]
# If no command is passed to the container, start Apache by default.
CMD ["apachectl", "-D", "FOREGROUND"]
build-scripts/web/docker-entrypoint.sh deleted 100644 → 0
+ 0
− 40
View file @ 622aca4c
#!/usr/bin/env bash
# Any background job should have it's messages printed.
set -m
# Don't continue if any command in the script fails.
set -e
# Delete any previously existing run file.
if [ -f /run/apache2/apache2.pid ]; then
rm /run/apache2/apache2.pid
fi
## Setup Drupal8 and Patternlab.
#cd /var/www/drupal8/profiles/uw_base_profile
#apt-get install composer
#composer config --global github-oauth.github.com 5e7a5890e9935f4a03a3785e11816851430e930c
#./rebuild.sh -y > tmp/profile-build.log
# Allow the Apache docroot to be overridden.
APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/drupal8}"
if [ -n "$APACHE_DOCROOT_DIR" ]; then
sed -i 's@^\s*DocumentRoot.*@'" DocumentRoot ${APACHE_DOCROOT_DIR}"'@' /etc/apache2/sites-available/000-default.conf
fi
# Allow the site name to be overriden.
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:-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
# Now that we're set up, run whatever command was passed to the entrypoint.
exec "$@"
build-scripts/web/php.ini deleted 100644 → 0
+ 0
− 1918
View file @ 622aca4c
This diff is collapsed.
docker-compose.yml
+ 21
− 7
View file @ 1773623a
version: '3'
services:
web:
container_name: wcms-web
build: ./build-scripts/web
drupal7:
container_name: wcms-drupal7
build: ./build-scripts/drupal7
ports:
- "8080:80"
- "4443:443"
stdin_open: true
tty: true
drupal8:
container_name: wcms-drupal8
build: ./build-scripts/drupal8
ports:
- "80:80"
- "443:443"
- "8081:80"
- "4444:443"
stdin_open: true
tty: true
db:
container_name: wcms-mysql
image: wodby/mariadb
build: ./build-scripts/db
volumes:
- ./db-backups:/var/mysql/backups:delegated
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: drupaldb
MYSQL_DATABASE: drupal8db
MYSQL_USER: drupal
MYSQL_PASSWORD: verybadpassword
ADDITIONAL_DATABASES: fdsu1 fdsu2 fdsu3 fdsu4
ports:
- "3306:3306"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment