Tidy up #168, #170

- Drop armv6 in README
- Remove unnecessary rsync step
- Remove some comments

Author: d7415

.github/workflows/build_push.yml

@@ -39,7 +39,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          # platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           push: true
           tags: |
             lycheeorg/lychee:testing-${{ github.run_id }}

.github/workflows/cron.yml

@@ -36,7 +36,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          # platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           push: true
           tags: |
             lycheeorg/lychee:testing-${{ github.run_id }}
@@ -66,7 +65,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          # platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           push: true
           build-args: |
             COMPOSER_NO_DEV=0

.github/workflows/pull.yml

@@ -30,7 +30,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          # platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           load: false
           push: false
           tags: |

.github/workflows/release.yml

@@ -39,7 +39,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          # platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           push: true
           build-args: |
             TARGET=release

Dockerfile

@@ -45,7 +45,6 @@ RUN \
     gifsicle \
     webp \
     cron \
-    rsync \
     composer \
     unzip && \
     addgroup --gid "$PGID" "$USER" && \
@@ -77,7 +76,7 @@ RUN \
 
 # Multi-stage build: Build static assets
 # This allows us to not include Node within the final container
-FROM node:20 as node_modules_go_brrr
+FROM node:20 as static_builder
 
 RUN mkdir /app
 
@@ -89,18 +88,9 @@ RUN \
     npm ci --no-audit && \
     npm run build
 
-# From our base container created above, we
-# create our final image, adding in static
-# assets that we generated above
+# Get the static assets built in the previous step
 FROM base
-
-# Packages like Laravel Nova may have added assets to the public directory
-# or maybe some custom assets were added manually! Either way, we merge
-# in the assets we generated above rather than overwrite them
-COPY --from=node_modules_go_brrr --chown=www-data:www-data /app/public /var/www/html/Lychee/public-npm
-RUN rsync -ar /var/www/html/Lychee/public-npm/ /var/www/html/Lychee/public/ \
-    && rm -rf /var/www/html/Lychee/public-npm \
-    && chown -R www-data:www-data /var/www/html/Lychee/public
+COPY --from=static_builder --chown=www-data:www-data /app/public /var/www/html/Lychee/public
 
 # Add custom Nginx configuration
 COPY default.conf /etc/nginx/nginx.conf

README.md

@@ -6,7 +6,6 @@
 <br>
 ![Supports amd64 Architecture][amd64-shield]
 ![Supports arm64/aarch64 Architecture][arm64-shield]
-![Supports armv6 Architecture][armv6-shield]
 ![Supports armv7 Architecture][armv7-shield]
 
 ## Notice: Dockerhub repository has been migrated to [lycheeorg/lychee](https://hub.docker.com/r/lycheeorg/lychee)  
@@ -143,7 +142,6 @@ If you need to add (not change) nginx directives, files mounted in `/etc/nginx/c
 
 [arm64-shield]: https://img.shields.io/badge/arm64-yes-success.svg?style=flat
 [amd64-shield]: https://img.shields.io/badge/amd64-yes-success.svg?style=flat
-[armv6-shield]: https://img.shields.io/badge/armv6-yes-success.svg?style=flat
 [armv7-shield]: https://img.shields.io/badge/armv7-yes-success.svg?style=flat
 [build-status-shield]: https://img.shields.io/github/actions/workflow/status/LycheeOrg/Lychee-Docker/cron.yml?label=%3Adev%20build
 [docker-pulls-shield-old]: https://img.shields.io/docker/pulls/lycheeorg/lychee-laravel.svg?style=flat&label=Docker%20Pulls%20(lychee-laravel)

entrypoint.sh

@@ -17,6 +17,7 @@ echo '
  | |__| |_| | (__| | | |  __/  __/ 
  |_____\__, |\___|_| |_|\___|\___| 
        |___/                       
+
 -------------------------------------
 Lychee Version: '$lycheeversion' ('$target')
 Lychee Commit:  '$shorthash'