From af8fa7ff8181a573f0d72bc178628d5c91218a60 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Mon, 27 Sep 2021 11:34:11 +0200 Subject: [PATCH] Docker: remove rsync from default images it's time to encourage people to switch to more modern alternatives like rclone --- Dockerfile | 4 ++-- Dockerfile.alpine | 4 ++-- docker/README.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fdf46cc7..e3fe4b36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,12 +25,12 @@ RUN set -xe && \ 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 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 diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d2671eb1..ee8d1f8e 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -28,12 +28,12 @@ RUN set -xe && \ 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 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 # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457 diff --git a/docker/README.md b/docker/README.md index 8cca43ed..4e5d94fb 100644 --- a/docker/README.md +++ b/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). 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. -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:-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