Skip to content

Commit

Permalink
Include 'src/runtime/**' in workflows and enhance cron setup.
Browse files Browse the repository at this point in the history
Added 'src/runtime/**' to the paths in multiple GitHub workflows to ensure they're triggered by changes in the runtime directory. Additionally, improved the cron setup by adding a crontab command in the entrypoint script and simplified the Dockerfile environment variables.
  • Loading branch information
nbejansen committed Sep 17, 2024
1 parent 8e9cc58 commit 3811370
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/php-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '2.x'
paths:
- 'src/php-*/**'
- 'src/runtime/**'
- 'src/Dockerfile'
- '.github/workflows/php-cli.yml'
- '.github/workflows/build-php.yml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/php-nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '2.x'
paths:
- 'src/php-*/**'
- 'src/runtime/**'
- 'src/Dockerfile'
- '.github/workflows/php-nginx.yml'
- '.github/workflows/build-php.yml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/php-ols.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '2.x'
paths:
- 'src/php-*/**'
- 'src/runtime/**'
- 'src/Dockerfile'
- '.github/workflows/php-ols.yml'
- '.github/workflows/build-php.yml'
Expand Down
3 changes: 1 addition & 2 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ ENV RUNTIME_UID=1000 \
RUNTIME_FILES_DIR=/app/files \
RUNTIME_LOGS_DIR=/app/logs \
RUNTIME_VERBOSITY=1 \
RUNTIME_BOOTED_FILE=/runtime/booted \
RUNTIME_CRONTABS_DIR=/app/.config/crontabs
RUNTIME_BOOTED_FILE=/runtime/booted

COPY --chmod=755 ./runtime/runtime/bin /runtime/bin

Expand Down
1 change: 1 addition & 0 deletions src/runtime/runtime/entrypoint.d/40-cron.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if [ -n "$RUNTIME_CRONTAB" ]; then
info "Cron: Enabled"
touch /etc/s6-overlay/s6-rc.d/user/contents.d/cron
template crontab.tmpl /var/spool/cron/crontabs/"$RUNTIME_USER"
crontab /var/spool/cron/crontabs/"$RUNTIME_USER"
else
info "Cron: Disabled"
fi

0 comments on commit 3811370

Please sign in to comment.