From b5f2aad04c598b8e4dee173d3c2eeefa0e5dc24c Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Tue, 16 May 2023 22:48:55 +0800
Subject: [PATCH] bump actions version & add no-install-recommends

---
 .github/workflows/docker-images.yml | 14 +++++++-------
 Dockerfile                          |  4 ++--
 dockerfiles/ftpsync/Dockerfile      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index fbcc96b..2da5d8f 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -54,18 +54,18 @@ jobs:
           echo "docker_file=${DF}" >> $GITHUB_ENV
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: github.event_name == 'push'
         with:
           path: /tmp/.buildx-cache
@@ -74,7 +74,7 @@ jobs:
             ${{ runner.os }}-buildx-${{ matrix.image }}-
       -
         name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         if: github.event_name == 'pull_request'
         with:
           path: /tmp/.buildx-cache
@@ -90,14 +90,14 @@ jobs:
           exit -1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v2
         if: github.event_name == 'push'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ${{ env.docker_file }}/Dockerfile
diff --git a/Dockerfile b/Dockerfile
index edd0b73..d250dd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@ FROM debian:buster
 MAINTAINER Justin Wong <yuzhi.wang@tuna.tsinghua.edu.cn>
 
 RUN apt-get update && \
-        apt-get install -y wget curl rsync lftp git jq python3-dev python3-pip yum-utils createrepo aria2 ack composer php-curl php-zip libnss-unknown
+        apt-get install --no-install-recommends -y wget curl rsync lftp git jq python3-dev python3-pip yum-utils createrepo aria2 ack composer php-curl php-zip libnss-unknown xz-utils patch unzip
 
 RUN if [ "$(uname -m)" != "x86_64" -a "$(uname -m)" != "i386" ]; then \
-      apt-get install -y libxml2-dev libxslt1-dev zlib1g-dev libssl-dev libffi-dev ;\
+      apt-get install --no-install-recommends -y libxml2-dev libxslt1-dev zlib1g-dev libssl-dev libffi-dev ;\
     fi
 
 RUN pip3 install --upgrade pip
diff --git a/dockerfiles/ftpsync/Dockerfile b/dockerfiles/ftpsync/Dockerfile
index e86de6a..eaee627 100644
--- a/dockerfiles/ftpsync/Dockerfile
+++ b/dockerfiles/ftpsync/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:bookworm
 MAINTAINER Justin Wong <yuzhi.wang@tuna.tsinghua.edu.cn>
 
 RUN apt-get update && \
-	apt-get install -y git rsync stunnel4 socat && \
+	apt-get install -y --no-install-recommends git rsync stunnel4 socat ca-certificates opensysusers && \
 	apt-get clean all
 
 RUN git clone https://ftp-master.debian.org/git/archvsync.git/ /ftpsync/