Branch franken from main

codebarista · Feb 19, 2024 · 0f3a943 · 0f3a943
1 parent 4c6a479
commit 0f3a943
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -1,3 +1,3 @@
-DOCKER_IMAGE_TAG=codebarista/octane:latest
+DOCKER_IMAGE_TAG=codebarista/octane:franken
 DOCKER_PLATFORM=linux/amd64,linux/arm64
 DOCKER_REGISTRY=docker.io
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -3,7 +3,7 @@ version: 3
 silent: true
 
 env:
-  TAG: '{{.DOCKER_IMAGE_TAG | default "codebarista/octane:latest"}}'
+  TAG: '{{.DOCKER_IMAGE_TAG | default "codebarista/octane:franken"}}'
   PLATFORM: '{{.DOCKER_PLATFORM | default "linux/amd64,linux/arm64"}}'
   REGISTRY: '{{.DOCKER_REGISTRY | default "docker.io"}}'
 

diff --git a/src/Dockerfile b/src/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:alpine
+FROM dunglas/frankenphp:alpine
 
 ARG INSTALLER_BASE_URL="https://github.com/mlocati/docker-php-extension-installer/releases"
 ARG SCHEDULE_CRONTAB="* * * * * /usr/local/bin/php /var/www/artisan schedule:run"
@@ -54,7 +54,6 @@ RUN install-php-extensions \
     pcntl \
     pdo_mysql \
     redis \
-    swoole \
     zip
 
 ### set timezone and clean-up

diff --git a/src/super.conf b/src/super.conf
@@ -7,7 +7,7 @@ pidfile=/var/run/supervisord.pid
 
 [program:octane]
 process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/artisan octane:start --server=swoole --host=0.0.0.0 --port=9000
+command=php /var/www/artisan octane:start --server=frankenphp --host=0.0.0.0 --admin-port=2019 --port=9000
 autostart=true
 autorestart=true
 environment=LARAVEL_OCTANE="1"