From f859f36f5ac5b9cd6a9ceba50a0a4a4fcc3051c0 Mon Sep 17 00:00:00 2001
From: Samuel Alfageme Sainz <samuel@alfage.me>
Date: Tue, 4 May 2021 19:53:02 +0200
Subject: [PATCH] docker-build: reduce all the reva* image sizes

- From 1.94GB to 40MB, using golang:alpine as builder and
scratch as base for the binary
- 'latest-eos' is still bloated due to being based on eos/slim

REPOSITORY                                          TAG                IMAGE ID       CREATED         SIZE
alfageme/revad                                      latest             fee1a27ac5f0   4 minutes ago   40MB
alfageme/revad                                      latest-eos         02fd02258069   5 hours ago     2.43GB
alfageme/reva                                       latest             b830b5559200   5 hours ago     16MB
---
 Dockerfile.reva      | 21 +++++++++++++++++++--
 Dockerfile.revad     | 32 +++++++++++++++++++++++++++-----
 Dockerfile.revad-eos | 28 ++++++++++++++++++++++++----
 Makefile             |  2 +-
 4 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.reva b/Dockerfile.reva
index ec12c4df17e..9269c2a33e7 100644
--- a/Dockerfile.reva
+++ b/Dockerfile.reva
@@ -16,9 +16,26 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:1.16
+FROM golang:alpine as builder
+
+RUN apk --no-cache add \
+  ca-certificates \
+  bash \
+  git \
+  gcc \
+  libc-dev \
+  make
+
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
 RUN make build-reva-docker && cp /go/src/github/cs3org/reva/cmd/reva/reva /go/bin/reva
-ENTRYPOINT ["/go/bin/reva"]
+
+FROM scratch
+
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /go/bin/reva /usr/bin/reva
+
+ENTRYPOINT [ "/usr/bin/reva" ]
diff --git a/Dockerfile.revad b/Dockerfile.revad
index 82c4db78e30..fec40722bf5 100644
--- a/Dockerfile.revad
+++ b/Dockerfile.revad
@@ -16,11 +16,33 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:1.16
+FROM golang:alpine as builder
+
+RUN apk --no-cache add \
+  ca-certificates \
+  bash \
+  git \
+  gcc \
+  libc-dev \
+  make
+
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
-RUN make build-revad-docker && cp /go/src/github/cs3org/reva/cmd/revad/revad /go/bin/revad && mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
-EXPOSE 9999
-EXPOSE 10000
-CMD ["/go/bin/revad", "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid"]
+RUN make build-revad-docker && \
+    cp /go/src/github/cs3org/reva/cmd/revad/revad /go/bin/revad
+
+RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
+
+FROM scratch
+
+EXPOSE 9999 10000
+
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /go/bin/revad /usr/bin/revad
+COPY --from=builder /etc/revad /etc/revad
+
+ENTRYPOINT [ "/usr/bin/revad" ]
+CMD [ "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid" ]
diff --git a/Dockerfile.revad-eos b/Dockerfile.revad-eos
index f87d324bdb9..0a214b29924 100644
--- a/Dockerfile.revad-eos
+++ b/Dockerfile.revad-eos
@@ -16,14 +16,34 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:1.16 as builder
+FROM golang:alpine as builder
+
+RUN apk --no-cache add \
+  ca-certificates \
+  bash \
+  git \
+  gcc \
+  libc-dev \
+  make
+
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
 RUN make build-revad-docker && \
     cp /go/src/github/cs3org/reva/cmd/revad/revad /go/bin/revad
 
-FROM gitlab-registry.cern.ch/dss/eos:c8_4.8.15
+RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
+
+FROM gitlab-registry.cern.ch/dss/eos/slim:4.8.43
+
 RUN mkdir -p /usr/local/bin
-COPY --from=builder /go/bin/revad /go/bin/
-RUN chmod +x /go/bin/revad
+
+COPY --from=builder /go/bin/revad /usr/bin/revad
+COPY --from=builder /etc/revad /etc/revad
+
+RUN chmod +x /usr/bin/revad
+
+ENTRYPOINT [ "/usr/bin/revad" ]
+CMD [ "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid" ]
diff --git a/Makefile b/Makefile
index fa2a59da177..e2656c0bede 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
 GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "dirty-"`
 VERSION=`git describe --always`
 GO_VERSION=`go version | awk '{print $$3}'`
-BUILD_FLAGS="-X main.gitCommit=${GIT_COMMIT} -X main.version=${VERSION} -X main.goVersion=${GO_VERSION} -X main.buildDate=${BUILD_DATE}"
+BUILD_FLAGS="-w -extldflags "-static" -X main.gitCommit=${GIT_COMMIT} -X main.version=${VERSION} -X main.goVersion=${GO_VERSION} -X main.buildDate=${BUILD_DATE}"
 LITMUS_URL_OLD="http://localhost:20080/remote.php/webdav"
 LITMUS_URL_NEW="http://localhost:20080/remote.php/dav/files/4c510ada-c86b-4815-8820-42cdf82c3d51"
 LITMUS_USERNAME="einstein"