Skip to content

Commit

Permalink
Upgrade release docker images to PHP 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Kovah committed Jan 12, 2025
1 parent ddda6c6 commit 3d57b2e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/public/hot
/public/storage
/public/mix-manifest.json
/lang/vendor
/storage/*.key
/tests/Controller/logs
/vendor
Expand Down
2 changes: 2 additions & 0 deletions lang/vendor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
2 changes: 1 addition & 1 deletion resources/docker/dockerfiles/release-base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/php:8.3-fpm-alpine
FROM docker.io/library/php:8.4-fpm-alpine

# Install package and PHP dependencies
RUN apk add --no-cache mariadb-client postgresql-client postgresql-dev sqlite zip libzip-dev supervisor \
Expand Down
16 changes: 11 additions & 5 deletions resources/docker/dockerfiles/release-multiplatform.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ================================
# PHP Dependency Setup
FROM docker.io/linkace/base-image:2.x-php-8.3 AS builder
FROM docker.io/linkace/base-image:2.x-php-8.4 AS builder
WORKDIR /app

# Pull composer and install required packages
Expand Down Expand Up @@ -38,7 +38,7 @@ RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-back

# ================================
# Compile all assets
FROM docker.io/library/node:20 AS npm_builder
FROM docker.io/library/node:22 AS npm_builder
WORKDIR /srv

COPY ./resources/assets ./resources/assets
Expand All @@ -49,7 +49,13 @@ RUN npm run production

# ================================
# Prepare the final image
FROM docker.io/linkace/base-image:2.x-php-8.3
FROM docker.io/linkace/base-image:2.x-php-8.4

LABEL org.opencontainers.image.title="LinkAce"
LABEL org.opencontainers.image.authors="Kevin Woblick <[email protected]>"
LABEL org.opencontainers.image.url="https://www.linkace.org"
LABEL org.opencontainers.image.source="https://github.com/Kovah/LinkAce"

WORKDIR /app
USER www-data

Expand All @@ -70,8 +76,8 @@ COPY --chown=www-data:www-data ["./artisan", "./composer.json", "./composer.lock
COPY --from=builder --chown=www-data:www-data /app/vendor /app/vendor
COPY --from=builder --chown=www-data:www-data /app/bootstrap/cache /app/bootstrap/cache

# Publish package resources
RUN php artisan vendor:publish --provider="Spatie\Backup\BackupServiceProvider"
# Publish backup language files
COPY --from=builder --chown=www-data:www-data /app/vendor/spatie/laravel-backup/resources/lang /app/lang/vendor/backup

# Copy files from the theme build
COPY --from=npm_builder --chown=www-data:www-data /srv/public/assets/dist/js /app/public/assets/dist/js
Expand Down

0 comments on commit 3d57b2e

Please sign in to comment.