Skip to content

Commit 87992df

Browse files
committed
🔼 Bump versions
1 parent 7ae27a6 commit 87992df

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
ARG php_version=8.3
1+
ARG php_version=8.4
2+
ARG frankenphp_version=1.4
23

3-
FROM dunglas/frankenphp:1.2-php${php_version} AS base
4+
FROM dunglas/frankenphp:${frankenphp_version}-php${php_version} AS base
45
WORKDIR /laravel
56
SHELL ["/bin/bash", "-eou", "pipefail", "-c"]
67

@@ -16,7 +17,6 @@ COPY src/php.ini "${PHP_INI_DIR}/php.ini"
1617
RUN apt-get update \
1718
&& apt-get satisfy -y --no-install-recommends \
1819
"curl (>=7.88)" \
19-
"supervisor (>=4.2)" \
2020
"unzip (>=6.0)" \
2121
"vim-tiny (>=2)" \
2222
&& rm -rf /var/lib/apt/lists/*

src/entrypoint.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ _migrate() {
1616
local count=0
1717
local timeout=20
1818

19-
while [ $count -lt "${timeout}" ]; do
19+
while [ "$count" -lt "$timeout" ]; do
2020
php -f /common/test_db_connection.php > /dev/null 2>&1
2121

2222
status=$?
2323

24-
if [ $status -eq 0 ]; then
24+
if [ "$status" -eq 0 ]; then
2525
echo "✅ Database connection successful."
2626
break
2727
fi
@@ -31,7 +31,7 @@ _migrate() {
3131
sleep 1
3232
done
3333

34-
if [ $count -eq "${timeout}" ]; then
34+
if [ "$count" -eq "$timeout" ]; then
3535
echo "⛔ Database connection failed after multiple attempts."
3636
exit 1
3737
fi
@@ -41,7 +41,7 @@ _migrate() {
4141
}
4242

4343
_setup() {
44-
if [ -n "${CONTAINER_MANUAL_SETUP}" ]; then
44+
if [ -n "$CONTAINER_MANUAL_SETUP" ]; then
4545
echo "⏭: Skipping setup..."
4646

4747
return
@@ -63,30 +63,30 @@ _setup() {
6363
}
6464

6565
_run() {
66-
case "${CONTAINER_MODE}" in
66+
case "$CONTAINER_MODE" in
6767
app)
6868
echo "🚀 Running octane..."
69-
exec "${ARTISAN}" octane:frankenphp --host=0.0.0.0 --port="${CONTAINER_PORT}"
69+
exec ${ARTISAN} octane:frankenphp --host=0.0.0.0 --port="$CONTAINER_PORT"
7070
;;
7171
worker)
7272
echo "⏳ Running the queue..."
73-
exec "${ARTISAN}" queue:work -vv \
73+
exec ${ARTISAN} queue:work -vv \
7474
--no-interaction \
75-
--tries="${CONTAINER_WORKER_TRIES}" \
76-
--sleep="${CONTAINER_WORKER_SLEEP}" \
77-
--timeout="${CONTAINER_WORKER_TIMEOUT}" \
78-
--delay="${CONTAINER_WORKER_DELAY}"
75+
--tries="$CONTAINER_WORKER_TRIES" \
76+
--sleep="$CONTAINER_WORKER_SLEEP" \
77+
--timeout="$CONTAINER_WORKER_TIMEOUT" \
78+
--delay="$CONTAINER_WORKER_DELAY"
7979
;;
8080
horizon)
8181
echo "Running horizon..."
82-
exec "${ARTISAN}" horizon
82+
exec ${ARTISAN} horizon
8383
;;
8484
scheduler)
8585
echo "📆 Running scheduled tasks..."
86-
exec "${ARTISAN}" schedule:work --verbose --no-interaction
86+
exec ${ARTISAN} schedule:work --verbose --no-interaction
8787
;;
8888
*)
89-
echo "⛔ Could not match the container mode [${CONTAINER_MODE}]"
89+
echo "⛔ Could not match the container mode [$CONTAINER_MODE]"
9090
exit 1
9191
;;
9292
esac

0 commit comments

Comments
 (0)