Compare commits

..

8 Commits

Author SHA1 Message Date
David Bomba
805e526fc9 Update docker-compose.yml 2020-11-11 10:25:05 +11:00
David Bomba
cdc35aff2f Update Dockerfile_v5 2020-11-11 10:08:21 +11:00
David Bomba
1de16ab390 Update Dockerfile_v5 2020-11-11 09:42:08 +11:00
David Bomba
b9ab50800d Update Dockerfile_v5
remove hirak global
2020-11-11 05:06:01 +11:00
codedge
d2d03b9b18 Merge pull request #198 from beremaran/master
add puppeteer and add SYS_ADMIN cap
2020-10-15 09:53:26 +02:00
Berke Emrecan Arslan
ea0f3fa981 add puppeteer and add SYS_ADMIN cap 2020-09-18 16:12:31 +03:00
codedge
1d9a8681b2 Merge pull request #193 from codedge/master
Make env vars file support compatible with IN 5
2020-08-19 10:46:01 +02:00
Holger Lösken
f98b3915bd Make env vars file support compatible with IN 5 2020-08-19 10:45:33 +02:00
3 changed files with 31 additions and 3 deletions

View File

@@ -7,6 +7,7 @@ ARG INVOICENINJA_VERSION
RUN set -eux; \
apk add --no-cache \
curl \
mysql-client \
libarchive-tools; \
mkdir -p /var/www/app
@@ -45,6 +46,7 @@ RUN set -eux; \
apk add --no-cache \
nodejs \
npm \
mysql-client \
freetype-dev \
gmp-dev \
libjpeg-turbo-dev \
@@ -67,6 +69,24 @@ RUN set -eux; \
COPY ./config/php/php.ini /usr/local/etc/php/php.ini
COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
RUN apk add --no-cache \
chromium \
nss \
freetype \
freetype-dev \
harfbuzz \
ca-certificates \
ttf-freefont \
nodejs \
yarn
# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
# Puppeteer v1.19.0 works with Chromium 77.
RUN yarn add puppeteer@1.19.0
## Separate user
ENV INVOICENINJA_USER=invoiceninja
@@ -82,8 +102,7 @@ RUN addgroup -S "$INVOICENINJA_USER" && \
chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
# Install Composer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer; \
composer global require hirak/prestissimo;
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer;
## Set up the cronjob and run cron daemon
RUN echo "* * * * * run-parts /etc/periodic/1min" >> /etc/crontabs/root

View File

@@ -30,11 +30,16 @@ services:
app:
image: invoiceninja/invoiceninja:5
restart: always
cap_add:
- SYS_ADMIN
environment:
- APP_URL=https://localhost
- APP_KEY=<INSERT THE GENERATED APPLICATION KEY HERE>
- MULTI_DB_ENABLED=false
- DB_HOST1=db
- DB_USERNAME1=ninja
- DB_PASSWORD1=ninja
- DB_DATABASE1=ninja
volumes:
# Configure your mounted directories, make sure the folder 'public' and 'storage'
# exist, before mounting them
@@ -91,4 +96,4 @@ volumes:
# logo:
networks:
invoiceninja:
invoiceninja:

View File

@@ -90,7 +90,11 @@ file_env 'APP_KEY'
file_env 'API_SECRET'
file_env 'CLOUDFLARE_API_KEY'
file_env 'DB_USERNAME'
file_env 'DB_USERNAME1'
file_env 'DB_USERNAME2'
file_env 'DB_PASSWORD'
file_env 'DB_PASSWORD1'
file_env 'DB_PASSWORD2'
file_env 'MAIL_USERNAME'
file_env 'MAIL_PASSWORD'
file_env 'MAILGUN_SECRET'