Compare commits

...

9 Commits

Author SHA1 Message Date
Samuel Laulhau
482b30b677 4.5.17 2019-12-03 16:34:22 +01:00
Susanne Gerber
7a45036c72 fix small spelling error 2019-10-29 15:33:19 +01:00
Samuel Laulhau
a963db2b63 4.5.16 2019-10-28 09:31:53 +01:00
Robin Chan
26a71f7f1f if web starts first without app, nginx will quit 2019-10-13 21:01:40 +02:00
Sam
af98f696b9 3.5.15 2019-10-08 10:09:00 +02:00
Martin Honermeyer
696d3b356a Unzip quietly 2019-09-19 09:38:01 +02:00
Samuel Laulhau
0ef00831f6 use stretch image
this is a work around for freetype on buster
2019-07-23 09:46:07 +02:00
Sam
6ba1f11221 4.5.14 2019-07-22 09:46:45 +02:00
Geoffroy Empain
933748e15b Use the correct docker host for mysql
`mysql` is not a valid host. The container name is `db` as specified by the `docker-compose.yml`.
2019-07-05 09:53:23 +02:00
4 changed files with 10 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
ARG PHP_IMAGE_TAG=7.2-fpm
ARG PHP_IMAGE_TAG=7.2-fpm-stretch
FROM php:${PHP_IMAGE_TAG}
LABEL maintainer="Samuel Laulhau <sam@lalop.co>"
@@ -37,7 +37,7 @@ RUN curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downl
&& mv ${PHANTOMJS} /usr/local/share \
&& ln -sf /usr/local/share/${PHANTOMJS}/bin/phantomjs /usr/local/bin \
&& rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
@@ -53,10 +53,10 @@ RUN { \
# DOWNLOAD AND INSTALL INVOICE NINJA
#####
ENV INVOICENINJA_VERSION 4.5.13
ENV INVOICENINJA_VERSION 4.5.17
RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
&& unzip ninja.zip -d /var/www/ \
&& unzip -q ninja.zip -d /var/www/ \
&& rm ninja.zip \
&& mv /var/www/ninja /var/www/app \
&& mv /var/www/app/storage /var/www/app/docker-backup-storage \
@@ -75,7 +75,7 @@ ENV SELF_UPDATER_SOURCE ''
ENV PHANTOMJS_BIN_PATH /usr/local/bin/phantomjs
#use to be mounted into nginx for exemple
# use to be mounted into nginx for example
VOLUME /var/www/app/public
WORKDIR /var/www/app

View File

@@ -36,7 +36,7 @@ RUN { \
# DOWNLOAD AND INSTALL INVOICE NINJA
#####
ENV INVOICENINJA_VERSION 4.5.13
ENV INVOICENINJA_VERSION 4.5.17
RUN curl -o ninja.zip -SL https://download.invoiceninja.com/ninja-v${INVOICENINJA_VERSION}.zip \
&& unzip ninja.zip -d /var/www/ \

View File

@@ -7,7 +7,7 @@ APP_KEY=SomeRandomStringSomeRandomString
APP_CIPHER=AES-256-CBC
DB_USERNAME=root
DB_PASSWORD=pwd
DB_HOST=mysql
DB_HOST=db
DB_DATABASE=ninja
MAIL_HOST=mail.service.host
MAIL_USERNAME=username

View File

@@ -43,6 +43,8 @@ services:
- public:/var/www/app/public
expose: # Expose ports without publishing them to the host machine - theyll only be accessible to linked services.
- "80"
depends_on:
- app
ports: # Delete if you want to use reverse proxy
- 8000:80
networks:
@@ -67,4 +69,4 @@ services:
done
EOF'
networks:
- default
- default