From f16adb87c4d9863db8dbf550c4651675c567afd8 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Wed, 6 Jul 2022 16:10:06 +0200
Subject: [PATCH] fix eos dockerfile

---
 Dockerfile.revad-eos                         | 26 +++++++++-----------
 changelog/unreleased/fix-eos-docker-image.md |  6 +++++
 2 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 changelog/unreleased/fix-eos-docker-image.md

diff --git a/Dockerfile.revad-eos b/Dockerfile.revad-eos
index 2a565cfbc9..3b3535025a 100644
--- a/Dockerfile.revad-eos
+++ b/Dockerfile.revad-eos
@@ -16,33 +16,29 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-FROM golang:alpine3.13 as builder
+FROM gitlab-registry.cern.ch/dss/eos/eos-all:4.8.66 as builder
 
-RUN apk --no-cache add \
-  ca-certificates \
-  bash \
-  git \
-  gcc \
-  libc-dev \
-  make
+RUN yum -y update && yum clean all
+
+RUN yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
+RUN yum install -y make git gcc libc-dev bash epel-release golang && \
+  yum clean all && \
+  rm -rf /var/cache/yum
 
 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
+RUN make build-revad-docker && cp /go/src/github/cs3org/reva/cmd/revad/revad /usr/bin/revad
 
-RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
+FROM gitlab-registry.cern.ch/dss/eos/eos-all:4.8.66
 
-FROM gitlab-registry.cern.ch/dss/eos/eos-all:4.8.57
+COPY --from=builder /usr/bin/revad /usr/bin/revad
 
+RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
 RUN mkdir -p /usr/local/bin
 
-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" ]
diff --git a/changelog/unreleased/fix-eos-docker-image.md b/changelog/unreleased/fix-eos-docker-image.md
new file mode 100644
index 0000000000..6d3c600162
--- /dev/null
+++ b/changelog/unreleased/fix-eos-docker-image.md
@@ -0,0 +1,6 @@
+Bugfix: Fix revad with EOS docker image
+
+We've fixed the revad with EOS docker image. Previously the revad
+binary was build on Alpine and not executable on the final RHEL based image.
+
+https://github.com/cs3org/reva/issues/3036