Skip to content

Commit a1a5a59

Browse files
ildyriaildyria
authored
Add vite compilation step & DROP ARMV6 (#168)
1 parent b39e8db commit a1a5a59

File tree

5 files changed

+55
-22
lines changed

5 files changed

+55
-22
lines changed

‎.github/workflows/build_push.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ jobs:
3838
with:
3939
context: .
4040
file: ./Dockerfile
41-
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
41+
platforms: linux/amd64,linux/arm/v7,linux/arm64
42+
# platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
4243
push: true
4344
tags: |
4445
lycheeorg/lychee:testing-${{ github.run_id }}

‎.github/workflows/cron.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,24 @@ jobs:
1919
uses: actions/checkout@v3
2020
-
2121
name: Set up QEMU
22-
uses: docker/setup-qemu-action@v2
22+
uses: docker/setup-qemu-action@v3.0.0
2323
-
2424
name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v2
25+
uses: docker/setup-buildx-action@v3.0.0
2626
-
2727
name: Login to DockerHub
28-
uses: docker/login-action@v2
28+
uses: docker/login-action@v3.0.0
2929
with:
3030
username: ${{ secrets.DOCKERHUB_USERNAME }}
3131
password: ${{ secrets.DOCKERHUB_TOKEN }}
3232
-
3333
name: Build and push
34-
uses: docker/build-push-action@v3
34+
uses: docker/build-push-action@v5.1.0
3535
with:
3636
context: .
3737
file: ./Dockerfile
38-
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
38+
platforms: linux/amd64,linux/arm/v7,linux/arm64
39+
# platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
3940
push: true
4041
tags: |
4142
lycheeorg/lychee:testing-${{ github.run_id }}
@@ -48,23 +49,24 @@ jobs:
4849
uses: actions/checkout@v3
4950
-
5051
name: Set up QEMU
51-
uses: docker/setup-qemu-action@v2
52+
uses: docker/setup-qemu-action@v3.0.0
5253
-
5354
name: Set up Docker Buildx
54-
uses: docker/setup-buildx-action@v2
55+
uses: docker/setup-buildx-action@v3.0.0
5556
-
5657
name: Login to DockerHub
57-
uses: docker/login-action@v2
58+
uses: docker/login-action@v3.0.0
5859
with:
5960
username: ${{ secrets.DOCKERHUB_USERNAME }}
6061
password: ${{ secrets.DOCKERHUB_TOKEN }}
6162
-
6263
name: Build and push
63-
uses: docker/build-push-action@v3
64+
uses: docker/build-push-action@v5.1.0
6465
with:
6566
context: .
6667
file: ./Dockerfile
67-
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
68+
platforms: linux/amd64,linux/arm/v7,linux/arm64
69+
# platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
6870
push: true
6971
build-args: |
7072
COMPOSER_NO_DEV=0

‎.github/workflows/pull.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,25 @@ jobs:
1919
uses: actions/checkout@v3
2020
-
2121
name: Set up QEMU
22-
uses: docker/setup-qemu-action@v2
22+
uses: docker/setup-qemu-action@v3.0.0
2323
-
2424
name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v2
25+
uses: docker/setup-buildx-action@v3.0.0
2626
-
2727
name: Test multiarch building
28-
uses: docker/build-push-action@v3
28+
uses: docker/build-push-action@v5.1.0
2929
with:
3030
context: .
3131
file: ./Dockerfile
32-
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
32+
platforms: linux/amd64,linux/arm/v7,linux/arm64
33+
# platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
3334
load: false
3435
push: false
3536
tags: |
3637
lycheeorg/lychee:testing-${{ github.run_id }}
3738
-
3839
name: Save amd64 image to pass to testing
39-
uses: docker/build-push-action@v3
40+
uses: docker/build-push-action@v5.1.0
4041
with:
4142
context: .
4243
file: ./Dockerfile

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,24 @@ jobs:
2222
uses: actions/checkout@v3
2323
-
2424
name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v3.0.0
2626
-
2727
name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v2
28+
uses: docker/setup-buildx-action@v3.0.0
2929
-
3030
name: Login to DockerHub
31-
uses: docker/login-action@v2
31+
uses: docker/login-action@v3.0.0
3232
with:
3333
username: ${{ secrets.DOCKERHUB_USERNAME }}
3434
password: ${{ secrets.DOCKERHUB_TOKEN }}
3535
-
3636
name: Build and push
37-
uses: docker/build-push-action@v3
37+
uses: docker/build-push-action@v5.1.0
3838
with:
3939
context: .
4040
file: ./Dockerfile
41-
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
41+
platforms: linux/amd64,linux/arm/v7,linux/arm64
42+
# platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
4243
push: true
4344
build-args: |
4445
TARGET=release

‎Dockerfile‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:bookworm-slim as base
22

33
# Set version label
44
LABEL maintainer="lycheeorg"
@@ -45,6 +45,7 @@ RUN \
4545
gifsicle \
4646
webp \
4747
cron \
48+
rsync \
4849
composer \
4950
unzip && \
5051
addgroup --gid "$PGID" "$USER" && \
@@ -74,6 +75,33 @@ RUN \
7475
apt-get clean -qy &&\
7576
rm -rf /var/lib/apt/lists/*
7677

78+
# Multi-stage build: Build static assets
79+
# This allows us to not include Node within the final container
80+
FROM node:20 as node_modules_go_brrr
81+
82+
RUN mkdir /app
83+
84+
RUN mkdir -p /app
85+
WORKDIR /app
86+
COPY --from=base /var/www/html/Lychee /app
87+
88+
RUN \
89+
npm ci --no-audit \
90+
npm run build
91+
92+
# From our base container created above, we
93+
# create our final image, adding in static
94+
# assets that we generated above
95+
FROM base
96+
97+
# Packages like Laravel Nova may have added assets to the public directory
98+
# or maybe some custom assets were added manually! Either way, we merge
99+
# in the assets we generated above rather than overwrite them
100+
COPY --from=node_modules_go_brrr --chown=www-data:www-data /app/public /var/www/html/Lychee/public-npm
101+
RUN rsync -ar /var/www/html/Lychee/public-npm/ /var/www/html/Lychee/public/ \
102+
&& rm -rf /var/www/html/Lychee/public-npm \
103+
&& chown -R www-data:www-data /var/www/html/Lychee/public
104+
77105
# Add custom Nginx configuration
78106
COPY default.conf /etc/nginx/nginx.conf
79107

0 commit comments

Comments
 (0)