From 052d586364d4e02d90a8bcc4fbece49a37a6b42f Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Tue, 23 May 2023 13:04:42 +0200
Subject: [PATCH] docker: remove distroless

Fix #1295

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
---
 .github/workflows/docker.yml | 15 ----------
 Dockerfile.distroless        | 58 ------------------------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 Dockerfile.distroless

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ec1a0ed0..d632e335 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -25,9 +25,6 @@ jobs:
           - true
           - false
         include:
-          - os: ubuntu-latest
-            docker_pkg: distroless
-            optional_deps: false
           - os: ubuntu-latest
             docker_pkg: debian-plugins
             optional_deps: true
@@ -64,11 +61,6 @@ jobs:
             VERSION="${VERSION}-alpine"
             VERSION_SLIM="${VERSION}-slim"
             DOCKERFILE=Dockerfile.alpine
-          elif [[ $DOCKER_PKG == distroless ]]; then
-            VERSION="${VERSION}-distroless"
-            VERSION_SLIM="${VERSION}-slim"
-            DOCKERFILE=Dockerfile.distroless
-            FEATURES="${FEATURES},nosqlite"
           elif [[ $DOCKER_PKG == debian-plugins ]]; then
             VERSION="${VERSION}-plugins"
             VERSION_SLIM="${VERSION}-slim"
@@ -93,13 +85,6 @@ jobs:
                 fi
                 TAGS="${TAGS},${DOCKER_IMAGE}:latest"
                 TAGS_SLIM="${TAGS_SLIM},${DOCKER_IMAGE}:slim"
-              elif [[ $DOCKER_PKG == distroless ]]; then
-                if [[ -n $MAJOR && -n $MINOR ]]; then
-                  TAGS="${TAGS},${DOCKER_IMAGE}:${MINOR}-distroless,${DOCKER_IMAGE}:${MAJOR}-distroless"
-                  TAGS_SLIM="${TAGS_SLIM},${DOCKER_IMAGE}:${MINOR}-distroless-slim,${DOCKER_IMAGE}:${MAJOR}-distroless-slim"
-                fi
-                TAGS="${TAGS},${DOCKER_IMAGE}:distroless"
-                TAGS_SLIM="${TAGS_SLIM},${DOCKER_IMAGE}:distroless-slim"
               elif [[ $DOCKER_PKG == debian-plugins ]]; then
                 if [[ -n $MAJOR && -n $MINOR ]]; then
                   TAGS="${TAGS},${DOCKER_IMAGE}:${MINOR}-plugins,${DOCKER_IMAGE}:${MAJOR}-plugins"
diff --git a/Dockerfile.distroless b/Dockerfile.distroless
deleted file mode 100644
index 34c9957c..00000000
--- a/Dockerfile.distroless
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM golang:1.20-bullseye as builder
-
-ENV CGO_ENABLED=0 GOFLAGS="-mod=readonly"
-
-RUN mkdir -p /workspace
-WORKDIR /workspace
-
-ARG GOPROXY
-
-COPY go.mod go.sum ./
-RUN go mod download
-
-ARG COMMIT_SHA
-
-# This ARG allows to disable some optional features and it might be useful if you build the image yourself.
-# For this variant we disable SQLite support since it requires CGO and so a C runtime which is not installed
-# in distroless/static-* images
-ARG FEATURES
-
-COPY . .
-
-RUN set -xe && \
-    export COMMIT_SHA=${COMMIT_SHA:-$(git describe --always --abbrev=8 --dirty)} && \
-    go build $(if [ -n "${FEATURES}" ]; then echo "-tags ${FEATURES}"; fi) -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/internal/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/v2/internal/version.date=`date -u +%FT%TZ`" -v -o sftpgo
-
-# Modify the default configuration file
-RUN sed -i 's|"users_base_dir": "",|"users_base_dir": "/srv/sftpgo/data",|' sftpgo.json && \
-    sed -i 's|"backups"|"/srv/sftpgo/backups"|' sftpgo.json && \
-    sed -i 's|"sqlite"|"bolt"|' sftpgo.json
-
-RUN apt-get update && apt-get install --no-install-recommends -y media-types openssh-server && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir /etc/sftpgo /var/lib/sftpgo /srv/sftpgo
-
-FROM gcr.io/distroless/static-debian11
-
-COPY --from=builder --chown=1000:1000 /etc/sftpgo /etc/sftpgo
-COPY --from=builder --chown=1000:1000 /srv/sftpgo /srv/sftpgo
-COPY --from=builder --chown=1000:1000 /var/lib/sftpgo /var/lib/sftpgo
-COPY --from=builder --chown=1000:1000 /workspace/sftpgo.json /etc/sftpgo/sftpgo.json
-COPY --from=builder --chown=1000:1000 /etc/ssh/moduli /etc/sftpgo/moduli
-COPY --from=builder /workspace/templates /usr/share/sftpgo/templates
-COPY --from=builder /workspace/static /usr/share/sftpgo/static
-COPY --from=builder /workspace/openapi /usr/share/sftpgo/openapi
-COPY --from=builder /workspace/sftpgo /usr/local/bin/
-COPY --from=builder /etc/mime.types /etc/mime.types
-
-# Log to the stdout so the logs will be available using docker logs
-ENV SFTPGO_LOG_FILE_PATH=""
-# These env vars are required to avoid the following error when calling user.Current():
-# unable to get the current user: user: Current requires cgo or $USER set in environment
-ENV USER=sftpgo
-ENV HOME=/var/lib/sftpgo
-
-WORKDIR /var/lib/sftpgo
-USER 1000:1000
-
-CMD ["sftpgo", "serve"]