From a193089646cb47885d515f0f4d9189229911c78d Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Wed, 23 Mar 2022 11:35:23 +0100 Subject: [PATCH] add jq to full docker image variants Fixes #767 Signed-off-by: Nicola Murino --- Dockerfile | 4 ++-- Dockerfile.alpine | 4 ++-- docs/plugins.md | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6933d1e7..57ff7dac 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 jq and the optional git and rsync dependencies 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 jq git rsync && 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 3471dafd..a9c9914c 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -28,12 +28,12 @@ RUN set -xe && \ FROM alpine:3.15 -# Set to "true" to install the optional git and rsync dependencies +# Set to "true" to install jq and the optional git and rsync dependencies 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 git rsync; fi +RUN if [ "${INSTALL_OPTIONAL_PACKAGES}" = "true" ]; then apk add --update --no-cache jq git rsync; fi # set up nsswitch.conf for Go's "netgo" implementation # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-424546457 diff --git a/docs/plugins.md b/docs/plugins.md index e6a97f4a..f91ccc67 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -14,6 +14,7 @@ The following plugin types are supported: - `notifier`, allows to receive notifications for supported filesystem events such as file uploads, downloads etc. and provider events such as objects add, update, delete. - `kms`, allows to support additional KMS providers. - `metadata`, allows to store metadata, such as the last modification time, for storage backends that does not support them (S3, Google Cloud Storage, Azure Blob). +- `ipfilter`, allows to allow/deny access based on client IP. Full configuration details can be found [here](./full-configuration.md).