diff --git a/Dockerfile.revad-eos b/Dockerfile.revad-eos index 2a565cfbc9..1b0523d155 100644 --- a/Dockerfile.revad-eos +++ b/Dockerfile.revad-eos @@ -16,33 +16,25 @@ # 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-slim:4.8.54 -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.57 - 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/eos-revad-dockerfile.md b/changelog/unreleased/eos-revad-dockerfile.md new file mode 100644 index 0000000000..fc39bf95d0 --- /dev/null +++ b/changelog/unreleased/eos-revad-dockerfile.md @@ -0,0 +1,3 @@ +Bugfix: Update Dockerfile.revad.eos to not break the image + +https://github.com/cs3org/reva/pull/2712 \ No newline at end of file