Compare commits

...

12 Commits

Author SHA1 Message Date
David Bomba
184564e022 Merge pull request #795 from benbrummer/octane
Use correct image for octane
2025-09-05 09:04:31 +10:00
Benjamin Brummer
2f31fc0da8 remove .gitignore and .editorconfig 2025-09-04 21:42:46 +02:00
Benjamin Brummer
7a37b9641d remove folders for bind mounts 2025-09-04 21:42:13 +02:00
Benjamin Brummer
1917de0046 align APP_URL with docker-compose.yaml port 2025-09-04 21:35:36 +02:00
Benjamin Brummer
c9f91b4a45 use octane image in compose file 2025-09-04 21:34:52 +02:00
David Bomba
0117fbd93e Merge pull request #791 from turbo124/octane
Rollback to 8.4
2025-09-03 07:27:52 +10:00
David Bomba
fc7b94a223 Rollback to 8.4 2025-09-03 07:27:05 +10:00
David Bomba
281b6a15a4 Roll back to PHP 8.3 2025-09-02 18:54:36 +10:00
David Bomba
5e6d21646c Merge pull request #788 from benbrummer/octane
Workaround: Disable SSL for mariadb-client for compatibility with MySQL
2025-09-02 06:21:46 +10:00
benbrummer
17c1705fe7 Workaround: Disable SSL for mariadb-client for compatibility with MySQL
Signed-off-by: benbrummer <info@benjamin-brummer.de>
2025-09-01 21:34:09 +02:00
David Bomba
9180712245 Merge pull request #785 from benbrummer/octane
Debian Trixie and php 8.4
2025-08-29 22:02:11 +10:00
benbrummer
94582c4658 Debian Trixie and php 8.4
Signed-off-by: benbrummer <info@benjamin-brummer.de>
2025-08-29 12:57:23 +02:00
7 changed files with 9 additions and 46 deletions

View File

@@ -1,24 +0,0 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
# Matches multiple files with brace expansion notation
# Set default charset
[*.*]
charset = utf-8
# Tab indentation (no size specified)
[Makefile]
indent_style = tab
# Matches the files *.yml
[*.yml]
indent_style = space
indent_size = 2

14
.gitignore vendored
View File

@@ -1,14 +0,0 @@
# OS files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
# Helm
charts/**/charts/
# Compose filesystem
/docker

2
debian/.env vendored
View File

@@ -1,5 +1,5 @@
# IN application vars
APP_URL=http://localhost:8012
APP_URL=http://localhost
APP_KEY=base64:RR++yx2rJ9kdxbdh3+AmbHLDQu+Q76i++co9Y8ybbno=
APP_ENV=production
APP_DEBUG=true

7
debian/Dockerfile vendored
View File

@@ -1,6 +1,6 @@
ARG PHP_VERSION=8.3
ARG PHP_VERSION=8.4
ARG FRANKENPHP_VERSION=1
ARG DEBIAN_VERSION=bookworm
ARG DEBIAN_VERSION=trixie
FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}-${DEBIAN_VERSION} AS prepare-app
@@ -72,6 +72,9 @@ RUN ln -s "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"
COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini
# Workaround: Disable SSL for mariadb-client for compatibility with MySQL
RUN echo "skip-ssl = true" >> /etc/mysql/mariadb.conf.d/50-client.cnf
# Create directory for artisan tinker (init.sh)
RUN mkdir /config/psysh \
&& chown ${user}: /config/psysh

View File

@@ -16,7 +16,7 @@ services:
app:
build:
context: .
image: invoiceninja/invoiceninja-debian:${TAG:-latest}
image: invoiceninja/invoiceninja-octane:${TAG:-latest}
restart: unless-stopped
# php artisan help octane:frankenphp
command: --port=80 --workers=2 --log-level=info
@@ -42,7 +42,7 @@ services:
logging: *default-logging
app-worker:
image: invoiceninja/invoiceninja-debian:${TAG:-latest}
image: invoiceninja/invoiceninja-octane:${TAG:-latest}
restart: unless-stopped
# php artisan help queue:work
command: --verbose --sleep=3 --tries=3 --max-time=3600
@@ -63,7 +63,7 @@ services:
logging: *default-logging
app-scheduler:
image: invoiceninja/invoiceninja-debian:${TAG:-latest}
image: invoiceninja/invoiceninja-octane:${TAG:-latest}
restart: unless-stopped
# php artisan help schedule:work
command: --verbose

View File

@@ -1 +0,0 @@

View File

@@ -1 +0,0 @@