Commit f4a6bf1b authored by Aaron Wells's avatar Aaron Wells
Browse files

WIP on making it work with 16.04

parent a3633ae6
FROM ubuntu:14.04
FROM ubuntu:16.04
MAINTAINER "Aaron Wells <aaronw@catalyst.net.nz>"
COPY catalyst.sources.list /etc/apt/sources.list
......@@ -13,22 +13,25 @@ ENV LOCALE en_US.UTF-8
# Install needed software
RUN apt-get update && apt-get install -y \
apache2 \
curl \
firefox \
git \
haveged \
libapache2-mod-php5 \
libapache2-mod-php \
postgresql \
php5-cli \
php5-curl \
php5-gd \
php5-json \
php5-ldap \
php5-pgsql \
php5-xmlrpc \
php-cli \
php-curl \
php-gd \
php-json \
php-ldap \
php-pgsql \
php-xmlrpc \
php-zip \
nodejs-legacy \
npm \
openjdk-7-jre \
openjdk-8-jre \
sudo \
supervisor \
wget \
xvfb \
......@@ -49,8 +52,8 @@ RUN /etc/init.d/postgresql start &&\
# Configure Apache
USER root
RUN sudo sh -c "echo 'post_max_size = 32M' >> /etc/php5/cli/php.ini"
RUN sudo sh -c "echo 'post_max_size = 32M' >> /etc/php5/apache2/php.ini"
RUN sudo sh -c "echo 'post_max_size = 32M' >> /etc/php/7.0/cli/php.ini"
RUN sudo sh -c "echo 'post_max_size = 32M' >> /etc/php/7.0/apache2/php.ini"
RUN mkdir -p /var/www/mahara
RUN chown -R www-data:www-data /var/www/mahara
COPY docker-apache.conf /etc/apache2/sites-available/000-default
......@@ -58,4 +61,4 @@ EXPOSE 80
# Start things up
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
CMD /usr/bin/supervisord -n -c /etc/supervisor/conf.d/supervisord.conf
\ No newline at end of file
CMD /usr/bin/supervisord -n -c /etc/supervisor/conf.d/supervisord.conf
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty main restricted
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty main restricted
deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial main restricted
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty-updates main restricted
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty-updates main restricted
deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial-updates main restricted
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial-updates main restricted
## Uncomment the following two lines to add software from the 'universe'
## repository.
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any
## review or updates from the Ubuntu security team.
deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty universe
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty universe
deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty-updates universe
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty-updates universe
deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial universe
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial universe
deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial-updates universe
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial-updates universe
## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes
## newer versions of some applications which may provide useful features.
## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team.
# deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty-backports main restricted
# deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty-backports main restricted
# deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial-backports main restricted
# deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial-backports main restricted
deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty-security main restricted
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty-security main restricted
deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty-security universe
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty-security universe
# deb http://ubuntu.catalyst.net.nz/ubuntu/ trusty-security multiverse
# deb-src http://ubuntu.catalyst.net.nz/ubuntu/ trusty-security multiverse
deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial-security main restricted
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial-security main restricted
deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial-security universe
deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial-security universe
# deb http://ubuntu.catalyst.net.nz/ubuntu/ xenial-security multiverse
# deb-src http://ubuntu.catalyst.net.nz/ubuntu/ xenial-security multiverse
......@@ -5,5 +5,5 @@ nodaemon=true
command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
[program:postgres]
command=/usr/lib/postgresql/9.3/bin/postgres -D /var/lib/postgresql/9.3/main -c config_file=/etc/postgresql/9.3/main/postgresql.conf
command=/usr/lib/postgresql/9.5/bin/postgres -D /var/lib/postgresql/9.5/main -c config_file=/etc/postgresql/9.5/main/postgresql.conf
user=postgres
Markdown is supported
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