Просмотр исходного кода

Docker: remove rsync from default images

it's time to encourage people to switch to more modern alternatives like
rclone
Nicola Murino 3 лет назад
Родитель
Сommit
af8fa7ff81
3 измененных файлов с 6 добавлено и 6 удалено
  1. 2 2
      Dockerfile
  2. 2 2
      Dockerfile.alpine
  3. 2 2
      docker/README.md

+ 2 - 2
Dockerfile

@@ -25,12 +25,12 @@ RUN set -xe && \
 
 
 FROM debian:bullseye-slim
 FROM debian:bullseye-slim
 
 
-# Set to "true" to install the optional git and rsync dependencies
+# Set to "true" to install the optional git dependency
 ARG INSTALL_OPTIONAL_PACKAGES=false
 ARG INSTALL_OPTIONAL_PACKAGES=false
 
 
 RUN apt-get update && apt-get install --no-install-recommends -y ca-certificates media-types && rm -rf /var/lib/apt/lists/*
 RUN apt-get update && apt-get install --no-install-recommends -y ca-certificates media-types && rm -rf /var/lib/apt/lists/*
 
 
-RUN if [ "${INSTALL_OPTIONAL_PACKAGES}" = "true" ]; then apt-get update && apt-get install --no-install-recommends -y git rsync && rm -rf /var/lib/apt/lists/*; fi
+RUN if [ "${INSTALL_OPTIONAL_PACKAGES}" = "true" ]; then apt-get update && apt-get install --no-install-recommends -y git && rm -rf /var/lib/apt/lists/*; fi
 
 
 RUN mkdir -p /etc/sftpgo /var/lib/sftpgo /usr/share/sftpgo /srv/sftpgo/data /srv/sftpgo/backups
 RUN mkdir -p /etc/sftpgo /var/lib/sftpgo /usr/share/sftpgo /srv/sftpgo/data /srv/sftpgo/backups
 
 

+ 2 - 2
Dockerfile.alpine

@@ -28,12 +28,12 @@ RUN set -xe && \
 
 
 FROM alpine:3.14
 FROM alpine:3.14
 
 
-# Set to "true" to install the optional git and rsync dependencies
+# Set to "true" to install the optional git dependency
 ARG INSTALL_OPTIONAL_PACKAGES=false
 ARG INSTALL_OPTIONAL_PACKAGES=false
 
 
 RUN apk add --update --no-cache ca-certificates tzdata mailcap
 RUN apk add --update --no-cache ca-certificates tzdata mailcap
 
 
-RUN if [ "${INSTALL_OPTIONAL_PACKAGES}" = "true" ]; then apk add --update --no-cache rsync git; fi
+RUN if [ "${INSTALL_OPTIONAL_PACKAGES}" = "true" ]; then apk add --update --no-cache git; fi
 
 
 # set up nsswitch.conf for Go's "netgo" implementation
 # set up nsswitch.conf for Go's "netgo" implementation
 # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457
 # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457

+ 2 - 2
docker/README.md

@@ -192,11 +192,11 @@ This image is based on the popular [Distroless project](https://github.com/Googl
 Distroless variant contains only a statically linked sftpgo binary and its minimal runtime dependencies and so it doesn't allow shell access (no shell is installed).
 Distroless variant contains only a statically linked sftpgo binary and its minimal runtime dependencies and so it doesn't allow shell access (no shell is installed).
 SQLite support is disabled since it requires CGO and so a C runtime which is not installed.
 SQLite support is disabled since it requires CGO and so a C runtime which is not installed.
 The default data provider is `bolt`, all the supported data providers expect `sqlite` work.
 The default data provider is `bolt`, all the supported data providers expect `sqlite` work.
-We only provide the slim variant and so the optional `git` and `rsync` dependencies are not available.
+We only provide the slim variant and so the optional `git` dependency is not available.
 
 
 ### `sftpgo:<suite>-slim`
 ### `sftpgo:<suite>-slim`
 
 
-These tags provide a slimmer image that does not include the optional `git` and `rsync` dependencies.
+These tags provide a slimmer image that does not include the optional `git` dependency.
 
 
 ## Helm Chart
 ## Helm Chart