Refactor, using variables
This commit is contained in:
parent
6b09ab1b44
commit
cd57753763
37
Dockerfile
37
Dockerfile
|
@ -4,31 +4,36 @@
|
||||||
|
|
||||||
FROM php:5.6-apache
|
FROM php:5.6-apache
|
||||||
|
|
||||||
MAINTAINER François Jacquet <francoisjacquet@users.noreply.github.com>
|
LABEL maintainer="François Jacquet <francoisjacquet@users.noreply.github.com>"
|
||||||
|
|
||||||
|
ENV PGHOST=rosariosisdb \
|
||||||
|
PGUSER=postgres \
|
||||||
|
PGPASSWORD=postgres \
|
||||||
|
PGDATABASE=postgres \
|
||||||
|
PGPORT=5432 \
|
||||||
|
ROSARIOSIS_YEAR=2017 \
|
||||||
|
ROSARIOSIS_LANG='en_US'
|
||||||
|
|
||||||
# Upgrade packages.
|
# Upgrade packages.
|
||||||
# Change date to force an upgrade:
|
|
||||||
RUN apt-get update # 2016-06-29
|
|
||||||
RUN apt-get upgrade -y
|
|
||||||
|
|
||||||
# Install git, Apache2 + PHP + PostgreSQL webserver, sendmail, wkhtmltopdf & others utilities.
|
# Install git, Apache2 + PHP + PostgreSQL webserver, sendmail, wkhtmltopdf & others utilities.
|
||||||
RUN apt-get install postgresql-client wkhtmltopdf libpq-dev libpng-dev libxml2-dev sendmail -y;
|
|
||||||
|
# Change date to force an upgrade:
|
||||||
|
RUN apt-get update && \
|
||||||
|
apt-get upgrade -y && \
|
||||||
|
apt-get install postgresql-client wkhtmltopdf libpq-dev libpng-dev libxml2-dev sendmail -y;
|
||||||
|
|
||||||
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
|
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
|
||||||
docker-php-ext-install -j$(nproc) gd mbstring xml pgsql gettext xmlrpc
|
docker-php-ext-install -j$(nproc) gd mbstring xml pgsql gettext xmlrpc
|
||||||
|
|
||||||
RUN mkdir /usr/src/rosariosis && curl -L https://github.com/francoisjacquet/rosariosis/tarball/v3.5 | tar xz --strip-components=1 -C /usr/src/rosariosis
|
# Download and extract rosariosis
|
||||||
|
ENV ROSARIOSIS_VERSION 'v3.5'
|
||||||
WORKDIR /usr/src/rosariosis
|
RUN mkdir /usr/src/rosariosis && \
|
||||||
|
curl -L https://github.com/francoisjacquet/rosariosis/tarball/${ROSARIOSIS_VERSION} \
|
||||||
RUN rm -rf /var/www/html && mkdir -p /var/www && \
|
| tar xz --strip-components=1 -C /usr/src/rosariosis && \
|
||||||
|
rm -rf /var/www/html && mkdir -p /var/www && \
|
||||||
ln -s /usr/src/rosariosis/ /var/www/html && chmod 777 /var/www/html &&\
|
ln -s /usr/src/rosariosis/ /var/www/html && chmod 777 /var/www/html &&\
|
||||||
chown -R www-data:www-data /usr/src/rosariosis
|
chown -R www-data:www-data /usr/src/rosariosis
|
||||||
|
|
||||||
|
|
||||||
# Uncomment to checkout a tagged release:
|
|
||||||
# RUN git checkout 2.9.3
|
|
||||||
|
|
||||||
# Copy our custom RosarioSIS configuration file.
|
# Copy our custom RosarioSIS configuration file.
|
||||||
COPY conf/config.inc.php /usr/src/rosariosis/config.inc.php
|
COPY conf/config.inc.php /usr/src/rosariosis/config.inc.php
|
||||||
COPY conf/.htaccess /usr/src/rosariosis/.htaccess
|
COPY conf/.htaccess /usr/src/rosariosis/.htaccess
|
||||||
|
|
|
@ -4,11 +4,11 @@ services:
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: sameersbn/postgresql:9.5
|
image: sameersbn/postgresql:9.5
|
||||||
environment:
|
# environment:
|
||||||
POSTGRES_PASSWORD: example
|
# POSTGRES_PASSWORD: example
|
||||||
DB_USER: rosario
|
# DB_USER: rosario
|
||||||
DB_PASS: rosariopwd
|
# DB_PASS: rosariopwd
|
||||||
DB_NAME: rosariosis
|
# DB_NAME: rosariosis
|
||||||
|
|
||||||
web:
|
web:
|
||||||
build: .
|
build: .
|
||||||
|
@ -18,14 +18,7 @@ services:
|
||||||
- db
|
- db
|
||||||
environment:
|
environment:
|
||||||
PGHOST: db
|
PGHOST: db
|
||||||
PGUSER: rosario
|
# PGUSER: rosario
|
||||||
PGPASSWORD: rosariopwd
|
# PGPASSWORD: rosariopwd
|
||||||
PGDATABASE: rosariosis
|
# PGDATABASE: rosariosis
|
||||||
PGPORT: 5432
|
# ROSARIOSIS_LANG: 'es_ES'
|
||||||
ROSARIOSIS_YEAR: 2017
|
|
||||||
ROSARIOSIS_LANG: 'es_ES'
|
|
||||||
|
|
||||||
adminer:
|
|
||||||
image: adminer
|
|
||||||
ports:
|
|
||||||
- 8081:8080
|
|
||||||
|
|
Loading…
Reference in New Issue