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

Added Open Scholar container.

parent 46ce9a13
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2279 additions and 9 deletions
.env
+ 1
− 1
View file @ f0223b3b
......@@ -22,7 +22,7 @@ DB_PASSWORD=vagrant
DB_ROOT_PASSWORD=root
DB_HOST=mariadb
DB_DRIVER=mysql
DB_ADDITIONAL=d7_fdsu1 d7_fdsu2 d7_fdsu3 d7_fdsu4 d8_fdsu2 d8_fdsu3 d8_fdsu4 d71_fdsu1 d71_fdsu2 d71_fdsu3 d71_fdsu4
DB_ADDITIONAL=d7_fdsu1 d7_fdsu2 d7_fdsu3 d7_fdsu4 d8_fdsu2 d8_fdsu3 d8_fdsu4 d71_fdsu1 d71_fdsu2 d71_fdsu3 d71_fdsu4 d7os_fdsu1 d7os_fdsu2 d7os_fdsu3 d7os_fdsu4
### PHP Setttings ###
......
build-scripts/drupal7os/000-default.conf 0 → 100644
+ 47
− 0
View file @ f0223b3b
<VirtualHost *:80>
DocumentRoot /var/www/drupal7os
ServerAdmin webmaster@localhost
ServerName wcms-docker
Redirect permanent / https://wcms-docker/
<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/drupal7os
ServerName wcms-docker
<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/drupal7os/Dockerfile 0 → 100644
+ 228
− 0
View file @ f0223b3b
############################################################
# Dockerfile to build WCMS container images
# Based on Ubuntu
############################################################
# Set the base image to Ubuntu
FROM ubuntu:xenial
# Pass the argument variables from the docker-compose file to the Dockerfile and echo them out
ARG PHP_VERSION
ARG DRUPAL7_VERSION
ARG PROJECT_BASE_URL
RUN echo "PHP version: $PHPVERSION"
RUN echo "Drupal 7 version: $DRUPAL7_VERSION"
RUN echo "Project base URL: $PROJECT_BASE_URL"
# Allows installing of packages without prompting the user to answer any questions
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
apt-get install --assume-yes \
software-properties-common \
language-pack-en \
curl \
apt-transport-https
## Add the repo to get the latest PHP versions
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
RUN export LANG=en_US.UTF-8
## Need LC_ALL= otherwise adding the repos throws an ascii error.
RUN LC_ALL=en_US.UTF-8 add-apt-repository -y ppa:ondrej/php
## Add the git repo so we can get the latest git (we need 2.9.2+)
RUN add-apt-repository ppa:git-core/ppa
RUN apt-get update
# Added so we can install 8.x branch of nodejs.
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
# Install packages.
RUN apt-get install -y \
vim \
git \
apache2 \
php${PHP_VERSION} \
php${PHP_VERSION}-apc \
php${PHP_VERSION}-fpm \
php${PHP_VERSION}-xml \
php${PHP_VERSION}-simplexml \
php${PHP_VERSION}-mbstring \
php${PHP_VERSION}-cli \
php${PHP_VERSION}-mysql \
php${PHP_VERSION}-gd \
php${PHP_VERSION}-gd \
php${PHP_VERSION}-curl \
php${PHP_VERSION}-ldap \
php${PHP_VERSION}-mcrypt \
php${PHP_VERSION}-zip \
php-pear \
libapache2-mod-php${PHP_VERSION} \
optipng \
pdftk \
jpegoptim \
imagemagick \
libapache2-mod-fcgid \
libapache2-mod-fastcgi \
curl \
mysql-client \
openssh-server \
wget \
ruby-sass \
ruby-compass \
nodejs \
dos2unix \
supervisor
RUN apt-get clean
## enable rewrite and ssl for apache2
RUN a2enmod rewrite
RUN a2enmod ssl
## for Content Security Policy (CSP).
RUN a2enmod headers
## fcgid needed to run multiple versions of PHP under the same apache.
## RUN a2enmod fcgid
## enable mcrypt
RUN phpenmod mcrypt
## add upload progress
RUN apt-get install php-uploadprogress
# Install Composer.
RUN curl -sS https://getcomposer.org/installer | php
RUN mv composer.phar /usr/local/bin/composer
# Install Drush 7.
RUN composer global require drush/drush:8.*
RUN composer global update
# Unfortunately, adding the composer vendor dir to the PATH doesn't seem to work. So:
RUN ln -s /root/.composer/vendor/bin/drush /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
## 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
## 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
# Replace the default site configuration with our own.
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
RUN a2enmod proxy_fcgi setenvif
RUN a2enconf php${PHP_VERSION}-fpm
RUN service php${PHP_VERSION}-fpm restart
## Make sure we are running php we selected
RUN update-alternatives --set php /usr/bin/php${PHP_VERSION}
RUN a2enmod php${PHP_VERSION}
RUN service apache2 restart
## Check version of PHP
RUN php -v
## Install Drupal.
RUN drush dl -v -d drupal-${DRUPAL7_VERSION} --destination="/var/www" --drupal-project-rename="drupal7os"
RUN chown -R www-data:www-data /var/www/
## Install the drush registry_rebuild module
RUN drush @none dl registry_rebuild-7.x
## Create the config folder in drupal root and an empty password_settings file
RUN mkdir /var/www/drupal7os/config
RUN touch /var/www/drupal7os/config/password_settings.php
## Create an empty fonts folder so I know where it's supposed to go! ;)
RUN mkdir /var/www/drupal7os/fonts
RUN cd /var/www/drupal7os && \
ln -s . fdsu1 && \
ln -s . fdsu2 && \
ln -s . fdsu3 && \
ln -s . fdsu4
## Create site folders for drupal multi-site
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu1
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu1/files
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu1/files/temp
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu1/modules
## Create settings.php file
COPY settings.conf /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu1/settings.php
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu2
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu2/files
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu2/files/temp
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu2/modules
## Create settings.php file
COPY settings.conf /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu2/settings.php
## Change sitename to match site
RUN cd /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu2 && \
sed -i 's/fdsu1/fdsu2/g' settings.php
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu3
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu3/files
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu3/files/temp
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu3/modules
## Create settings.php file
COPY settings.conf /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu3/settings.php
## Change sitename to match site
RUN cd /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu3 && \
sed -i 's/fdsu1/fdsu3/g' settings.php
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu4
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu4/files
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu4/files/temp
RUN mkdir /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu4/modules
## Create settings.php file
COPY settings.conf /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu4/settings.php
## Change sitename to match site
RUN cd /var/www/drupal7os/sites/${PROJECT_BASE_URL}.fdsu4 && \
sed -i 's/fdsu1/fdsu4/g' settings.php
## Get the base profile from git
RUN git clone https://git.uwaterloo.ca/wcms/uw_base_profile.git /var/www/drupal7os/profiles/uw_base_profile
RUN chown -R vagrant:www-data /var/www/drupal7os/profiles/uw_base_profile
RUN chmod -R g+w /var/www/drupal7os/profiles/uw_base_profile
## Add the Open Scholar Profile to the container
RUN cd /var/www/drupal7os/profiles
RUN git clone -b 7.x-3.x --single-branch https://git.uwaterloo.ca/wcms-openscholar/openscholar
## Add the Servername to the apache2 conf file.
## RUN echo "ServerName ${PROJECT_BASE_URL}" >> /etc/apache2/apache2.conf
# Copy our custom entrypoint and make it executable.
COPY docker-entrypoint-d7os.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint-d7os.sh
## Add Drupal specific changes for PHP to the php.ini files.
RUN sed -i "s/display_errors = .*/display_errors = On/" /etc/php/${PHP_VERSION}/apache2/php.ini && \
sed -i "s/display_errors = .*/display_errors = On/" /etc/php/${PHP_VERSION}/fpm/php.ini && \
sed -i "s/display_errors = .*/display_errors = On/" /etc/php/${PHP_VERSION}/cli/php.ini && \
sed -i "s/max_execution_time =.*/max_execution_time = 240/" /etc/php/${PHP_VERSION}/apache2/php.ini && \
sed -i "s/max_execution_time =.*/max_execution_time = 240/" /etc/php/${PHP_VERSION}/cli/php.ini && \
sed -i "s/max_input_time = .*/max_input_time = 240/" /etc/php/${PHP_VERSION}/apache2/php.ini && \
sed -i "s/max_input_time = .*/max_input_time = 240/" /etc/php/${PHP_VERSION}/cli/php.ini && \
sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php/${PHP_VERSION}/apache2/php.ini && \
sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php/${PHP_VERSION}/cli/php.ini && \
sed -i "s/; max_input_vars = .*/max_input_vars = 10000/" /etc/php/${PHP_VERSION}/apache2/php.ini && \
sed -i "s/;date.timezone = */date.timezone = America\/Toronto/" /etc/php/${PHP_VERSION}/apache2/php.ini && \
sed -i "s/;date.timezone = */date.timezone = America\/Toronto/" /etc/php/${PHP_VERSION}/cli/php.ini
COPY servername.conf /etc/apache2/conf-available
RUN a2enconf servername
# Expose the default Apache port.
EXPOSE 80
EXPOSE 443
# Replace the standard entrypoint /bin/sh with our script.
ENTRYPOINT ["docker-entrypoint-d7os.sh"]
# If no command is passed to the container, start Apache by default.
CMD ["apachectl", "-D", "FOREGROUND"]
build-scripts/drupal7os/docker-entrypoint-d7os.sh 0 → 100644
+ 41
− 0
View file @ f0223b3b
#!/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
# Allow the Apache docroot to be overridden.
APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/drupal7}"
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:-docker}"
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:-wcms-docker}"
if [ -n "$APACHE_SITE_ALIAS" ]; then
sed -i 's@^\s*ServerAlias.*@'" ServerAlias ${APACHE_SITE_ALIAS}"'@' /etc/apache2/sites-available/000-default.conf
fi
## Change default PHP to 5.6 (just to be sure).
#a2dismod php7.2 && a2enmod php5.6 && update-alternatives --set php /usr/bin/php5.6 && service apache2 restart
## Change permissions on /var/www/drupal7os
chown -R vagrant:www-data /var/www/drupal7os
chmod -R g+w /var/www/drupal7
# Now that we're set up, run whatever command was passed to the entrypoint.
exec "$@"
build-scripts/drupal7os/php.ini 0 → 100644
+ 1918
− 0
View file @ f0223b3b
This diff is collapsed.
build-scripts/drupal7os/servername.conf 0 → 100644
+ 1
− 0
View file @ f0223b3b
ServerName wcms-docker
\ No newline at end of file
build-scripts/drupal7os/settings.conf 0 → 100644
+ 24
− 0
View file @ f0223b3b
<?php
// Server domain name.
$UWhost = 'wcms-docker:4443';
// Path to site root.
$UWpref = 'fdsu1';
// Name of site database.
$UWdb = 'd7os_fdsu1';
//Username to connect to site database.
$UWuser = 'drupal';
// Password to connect to site database.
$UWpass = 'vagrant';
// Hostname to connect to site database.
$UWpri = 'db';
require_once(DRUPAL_ROOT . '/profiles/uw_base_profile/drupal-settings.php');
// File system.
$conf['file_default_scheme'] = 'public';
$conf['file_private_path'] = '/var/www/drupal7os/sites/wcms-docker.fdsu1/files/private/';
$conf['file_public_path'] = '/var/www/drupal7os/sites/wcms-docker.fdsu1/files';
$conf['file_temporary_path'] = '/var/www/drupal7os/sites/wcms-docker.fdsu1/files/temp/';
unset ($conf['file_chmod_directory']);
unset ($conf['file_chmod_file']);
\ No newline at end of file
docker-compose.yml
+ 19
− 8
View file @ f0223b3b
......@@ -13,9 +13,7 @@ services:
ports:
- "8080:80"
- "4443:443"
stdin_open: true
tty: true
......@@ -31,8 +29,22 @@ services:
ports:
- "8081:80"
- "4444:443"
stdin_open: true
tty: true
drupal7os:
container_name: ${PROJECT_NAME}_drupal7os
build:
context: ./build-scripts/drupal7os
args:
PHP_VERSION: ${PHP_VERSION}
DRUPAL7_VERSION: ${DRUPAL7_VERSION}
PROJECT_BASE_URL: ${PROJECT_BASE_URL}
ports:
- "8082:80"
- "4445:443"
stdin_open: true
tty: true
......@@ -47,10 +59,9 @@ services:
PROJECT_BASE_URL: ${PROJECT_BASE_URL}
ports:
- "8082:80"
- "4445:443"
- "8083:80"
- "4446:443"
stdin_open: true
tty: true
......
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