Skip to content

Commit

Permalink
Fix release dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Kovah committed May 2, 2024
1 parent d08aa30 commit 19e1954
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ docker compose exec -it php composer run test
The Base image for LinkAce contains several packages and PHP extensions needed by LinkAce. It shortens the build time of the release images. This step is not needed by any developer working on LinkAce and is just a documentation for maintainers.

```bash
docker buildx build --push --platform "linux/amd64,linux/arm64,linux/arm/v7" -t linkace/base-image:php-8.2-alpine -f resources/docker/dockerfiles/release-base.Dockerfile .
docker buildx build --push --platform "linux/amd64,linux/arm64,linux/arm/v7" -t linkace/base-image:php-8.3-alpine -f resources/docker/dockerfiles/release-base.Dockerfile .
```
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DOCKERFILE RELEASE
FROM docker.io/library/linkace/linkace:latest
FROM docker.io/linkace/linkace:latest

# Install nginx and supervisor
RUN apk add --no-cache nginx supervisor
Expand Down
6 changes: 3 additions & 3 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/library/linkace/base-image:php-8.3-alpine AS builder
FROM docker.io/linkace/base-image:php-8.3-alpine 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 node:20 AS npm_builder
FROM docker.io/library/node:20 AS npm_builder
WORKDIR /srv

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

# ================================
# Prepare the final image
FROM linkace/base-image:php-8.3-alpine
FROM docker.io/linkace/base-image:php-8.3-alpine
WORKDIR /app

# Copy the app into the container
Expand Down

0 comments on commit 19e1954

Please sign in to comment.