wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2026-01-18 20:34:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for V4 container

Browse Source
This commit is contained in:
David Bomba
2021-01-05 17:14:49 +11:00
parent c624f6ed40
commit f03860d8ea
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
alpine/Dockerfile
View File

@@ -2,7 +2,7 @@ ARG PHP_VERSION=7.2
FROM php:${PHP_VERSION}-fpm-alpine
LABEL maintainer="Samuel Laulhau <sam@lalop.co>, Holger Lösken <holger.loesken@codedge.de>"
LABEL maintainer="David Bomba <turbo124@gmail.com>"
#####
# SYSTEM REQUIREMENT
@@ -24,8 +24,8 @@ RUN set -eux; \
libzip-dev
RUN docker-php-ext-configure gd --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include --with-webp-dir=/usr/include --with-freetype-dir=/usr/include/; \
docker-php-ext-configure zip --with-libzip; \
docker-php-ext-install -j$(nproc) \
docker-php-ext-configure zip --with-libzip; \
docker-php-ext-install -j$(nproc) \
iconv \
gd \
gmp \
@@ -41,8 +41,8 @@ COPY ./config/php/php-cli.ini /usr/local/etc/php/php-cli.ini
# Separate user
ENV IN_USER=invoiceninja
RUN addgroup -S "$IN_USER" && \
adduser \
RUN addgroup --gid=1500 -S "$IN_USER" && \
adduser --uid=1500 \
--disabled-password \
--gecos "" \
--home "$(pwd)" \
@@ -63,7 +63,6 @@ RUN curl -s -o /tmp/ninja.zip -SL https://download.invoiceninja.com/ninja-v${INV
&& mv /var/www/app/storage /var/www/app/docker-backup-storage \
&& mv /var/www/app/public /var/www/app/docker-backup-public \
&& mkdir -p /var/www/app/public/logo /var/www/app/storage \
&& cp /var/www/app/.env.example /var/www/app/.env \
&& chmod -R 755 /var/www/app/storage \
&& rm -rf /var/www/app/docs /var/www/app/tests

2
config/nginx/in-vhost.conf
View File

@@ -1,6 +1,6 @@
server {
listen 80 default_server;
server_name _ in.localhost;
server_name _;
root /var/www/app/public/;
index index.php;

6
docker-compose.yml
View File

@@ -79,9 +79,9 @@ services:
# cron:
# image: invoiceninja/invoiceninja:alpine-4
# volumes:
# - storage:/var/www/app/storage
# - logo:/var/www/app/public/logo
# - public:/var/www/app/public
# - ./docker/app/public:/var/www/app/public:rw,delegated
# - ./docker/app/storage:/var/www/app/storage:rw,delegated
# - ./docker/app/public/logo:/var/www/app/public/logo:rw,delegated
# entrypoint: |
# /bin/sh -c 'sh -s <<EOF
# trap "break;exit" SIGHUP SIGINT SIGTERM

11
env
View File

@@ -9,8 +9,9 @@ DB_DATABASE1=ninja
PHANTOMJS_PDF_GENERATION=false
#V4 env vars
DB_STRICT='false'
DB_HOST='db'
DB_DATABASE='ninja'
DB_USERNAME='ninja'
DB_PASSWORD='ninja'
DB_STRICT=false
DB_HOST=db
DB_DATABASE=ninja
DB_USERNAME=ninja
DB_PASSWORD=ninja
APP_CIPHER=AES-256-CBC