Skip to content

Commit

Permalink
fix: update eos-revad dockerfile (#2712)
Browse files Browse the repository at this point in the history
  • Loading branch information
jimil749 authored May 3, 2022
1 parent 9b6b969 commit e62dd05
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
24 changes: 8 additions & 16 deletions Dockerfile.revad-eos
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
3 changes: 3 additions & 0 deletions changelog/unreleased/eos-revad-dockerfile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: Update Dockerfile.revad.eos to not break the image

https://github.com/cs3org/reva/pull/2712

0 comments on commit e62dd05

Please sign in to comment.