mirror of
https://github.com/invoiceninja/dockerfiles.git
synced 2026-01-06 14:37:26 +01:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff897d568f | ||
|
|
b0bb0ffd25 | ||
|
|
3902b40bc1 | ||
|
|
29e2d93e59 | ||
|
|
b7aea66e62 | ||
|
|
e2db08f207 | ||
|
|
59291d8687 |
@@ -28,7 +28,7 @@ RUN npm install --production \
|
|||||||
&& mv /var/www/app/public $BAK_PUBLIC_PATH
|
&& mv /var/www/app/public $BAK_PUBLIC_PATH
|
||||||
|
|
||||||
# Prepare php image
|
# Prepare php image
|
||||||
FROM php:${PHP_VERSION}-fpm-alpine as prod
|
FROM php:${PHP_VERSION}-fpm-alpine3.13 as prod
|
||||||
ARG INVOICENINJA_VERSION
|
ARG INVOICENINJA_VERSION
|
||||||
ARG BAK_STORAGE_PATH
|
ARG BAK_STORAGE_PATH
|
||||||
ARG BAK_PUBLIC_PATH
|
ARG BAK_PUBLIC_PATH
|
||||||
@@ -88,8 +88,7 @@ WORKDIR /var/www/app
|
|||||||
|
|
||||||
# Do not remove this ENV
|
# Do not remove this ENV
|
||||||
ENV IS_DOCKER true
|
ENV IS_DOCKER true
|
||||||
RUN /usr/local/bin/composer install --no-dev --quiet \
|
RUN /usr/local/bin/composer install --no-dev --quiet
|
||||||
&& rm .env
|
|
||||||
|
|
||||||
# Override the environment settings from projects .env file
|
# Override the environment settings from projects .env file
|
||||||
ENV APP_ENV production
|
ENV APP_ENV production
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.5.0
|
version: 0.5.1
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ The following table shows the configuration options for the Invoice Ninja helm c
|
|||||||
| `extraEnvVars` | Extra environment variables to be set on Invoice Ninja container | `{}` |
|
| `extraEnvVars` | Extra environment variables to be set on Invoice Ninja container | `{}` |
|
||||||
| `extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `nil` |
|
| `extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `nil` |
|
||||||
| `extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `nil` |
|
| `extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `nil` |
|
||||||
|
| `trustedProxy` | List of trusted proxies for Invoice Ninja to communicate with the nginx proxy | `'*'` |
|
||||||
|
|
||||||
### Invoice Ninja deployment parameters
|
### Invoice Ninja deployment parameters
|
||||||
|
|
||||||
|
|||||||
@@ -62,3 +62,4 @@ data:
|
|||||||
REDIS_QUEUE_CONNECTION: {{ include "invoiceninja.redisQueueConnection" . | quote }}
|
REDIS_QUEUE_CONNECTION: {{ include "invoiceninja.redisQueueConnection" . | quote }}
|
||||||
SESSION_CONNECTION: {{ include "invoiceninja.redisSessionConnection" . | quote }}
|
SESSION_CONNECTION: {{ include "invoiceninja.redisSessionConnection" . | quote }}
|
||||||
REQUIRE_HTTPS: {{ .Values.requireHttps | quote }}
|
REQUIRE_HTTPS: {{ .Values.requireHttps | quote }}
|
||||||
|
TRUSTED_PROXIES: {{ .Values.trustedProxies | quote }}
|
||||||
|
|||||||
@@ -68,6 +68,10 @@ sessionDriver: ""
|
|||||||
##
|
##
|
||||||
queueConnection: ""
|
queueConnection: ""
|
||||||
|
|
||||||
|
## List of trusted proxies for Invoice Ninja to communicate with the nginx proxy
|
||||||
|
##
|
||||||
|
trustedProxies: "*"
|
||||||
|
|
||||||
## Use local or Phantom JS PDF generation
|
## Use local or Phantom JS PDF generation
|
||||||
##
|
##
|
||||||
snappdf: true
|
snappdf: true
|
||||||
|
|||||||
Reference in New Issue
Block a user