Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
sethsandaru committed Feb 14, 2024
1 parent 8944cc3 commit 703f7ce
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ RUN docker-php-ext-install pdo mbstring exif pcntl bcmath gd
COPY . .
COPY ./.docker/docking-worker.conf /etc/supervisor/conf.d/
COPY ./.docker/docking-host.conf /etc/nginx/conf.d/default.conf
COPY ./.docker/php-fpm.conf /usr/local/etc/php-fpm.d/

RUN cp .docker/entrypoint.sh /entrypoint
RUN chmod +x /entrypoint

# The bundle already built, no need to keep this to save size
# The bundle already built (outer layer), no need to keep this to save size
RUN rm -rf ./node_modules

RUN php artisan optimize
Expand Down
6 changes: 3 additions & 3 deletions .docker/docking-octane.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stopasgroup=true
killasgroup=true
numprocs=5
redirect_stderr=true
stdout_logfile=/dev/stdout
stdout_logfile=/proc/1/fd/1
stdout_logfile_maxbytes=0
stopwaitsecs=3600

Expand All @@ -16,7 +16,7 @@ command=php /var/www/html/artisan octane:start --max-requests=500
autostart=true
autorestart=true
redirect_stderr=true
stdout_logfile=/dev/stdout
stdout_logfile=/proc/1/fd/1
stdout_logfile_maxbytes=0
process_name=%(program_name)s_%(process_num)02d

Expand All @@ -28,6 +28,6 @@ startretries=5
numprocs=1
startsecs=0
redirect_stderr=true
stdout_logfile=/dev/stdout
stdout_logfile=/proc/1/fd/1
stdout_logfile_maxbytes=0
process_name=%(program_name)s_%(process_num)02d
6 changes: 3 additions & 3 deletions .docker/docking-worker.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ stopasgroup=true
killasgroup=true
numprocs=5
redirect_stderr=true
stdout_logfile=/dev/stdout
stdout_logfile=/proc/1/fd/1
stdout_logfile_maxbytes=0
stopwaitsecs=3600

[program:docking-php-fpm]
command=php-fpm -F -R
autostart=true
autorestart=true
stdout_logfile=/dev/stdout
stdout_logfile=/proc/1/fd/1
stdout_logfile_maxbytes=0
process_name=%(program_name)s_%(process_num)02d

Expand All @@ -26,6 +26,6 @@ autorestart=true
startretries=5
numprocs=1
startsecs=0
stdout_logfile=/dev/stdout
stdout_logfile=/proc/1/fd/1
stdout_logfile_maxbytes=0
process_name=%(program_name)s_%(process_num)02d
3 changes: 3 additions & 0 deletions .docker/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[global]
error_log = /proc/1/fd/1

17 changes: 10 additions & 7 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ services:
docking:
build:
context: .
dockerfile: .docker/Dockerfile
dockerfile: .docker/octane.Dockerfile
volumes:
- ./seth.sqlite:/var/www/html/database/seth.sqlite
- app_storage:/var/www/html/storage/app
links:
- gotenberg
environment:
DATABASE_URL: 'sqlite:////var/www/html/database/seth.sqlite'
# links:
# - gotenberg
ports:
- '8888:80'

gotenberg:
image: gotenberg/gotenberg:7
ports:
- '9898:3000'
# gotenberg:
# image: gotenberg/gotenberg:7
# ports:
# - '9898:3000'

volumes:
app_storage:
1 change: 1 addition & 0 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

Route::get('/', function () {
\Illuminate\Support\Facades\Log::error('test');
return view('welcome');
});

Expand Down

0 comments on commit 703f7ce

Please sign in to comment.