Fix files.

This commit is contained in:
James Cole 2019-11-01 06:15:02 +01:00
parent 4cd824f3b7
commit 3fc653687c
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 4 additions and 31 deletions

View File

@ -1,26 +0,0 @@
server {
listen 80 default_server;
server_name _ *.vm docker;
root "/app/public";
index index.php;
include /opt/docker/etc/nginx/vhost.common.d/*.conf;
}
##############
# SSL
##############
server {
listen 443 default_server;
server_name _ *.vm docker;
root "/app/public";
index index.php;
include /opt/docker/etc/nginx/vhost.common.d/*.conf;
include /opt/docker/etc/nginx/vhost.ssl.conf;
}

View File

@ -23,7 +23,6 @@ jobs:
env: ARCH=arm64 VERSION=4.8.1.8
script:
- .deploy/docker/travis.sh
# enable experimental features.
- echo $TRAVIS_DIST
- echo $ARCH
- .deploy/docker/travis.sh

View File

@ -21,13 +21,13 @@ RUN a2enmod rewrite && a2enmod ssl && \
sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini
# copy ca certs to correct location
COPY ./cacert.pem /usr/local/ssl/cert.pem
COPY ./.deploy/docker/local-build/cacert.pem /usr/local/ssl/cert.pem
# copy Apache config to correct spot.
COPY ./apache2.conf /etc/apache2/apache2.conf
COPY ./.deploy/docker/local-build/apache2.conf /etc/apache2/apache2.conf
# Enable default site (Firefly III)
COPY ./apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf
COPY ./.deploy/docker/local-build/apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf
# See also: https://github.com/JC5/firefly-iii-base-image