Skip to content

Commit

Permalink
Fix Dockerfile.revad-eos (#3706) (#3718)
Browse files Browse the repository at this point in the history
  • Loading branch information
vascoguita authored Mar 9, 2023
1 parent 3ddca07 commit 07198ea
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 21 deletions.
31 changes: 10 additions & 21 deletions Dockerfile.revad-eos
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,24 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM gitlab-registry.cern.ch/dss/eos/eos-fusex:4.8.91 as builder
FROM golang:alpine3.16 as builder

RUN yum -y install \
gcc \
git \
golang \
make && \
yum clean all && \
rm -rf /var/cache/yum

ADD https://golang.org/dl/go1.19.linux-amd64.tar.gz \
go1.19.linux-amd64.tar.gz

RUN rm -rf /usr/local/go && \
tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz && \
rm go1.19.linux-amd64.tar.gz
RUN apk --no-cache add \
bash \
make

ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go
WORKDIR /go/src/github/cs3org/reva

WORKDIR /home/reva
COPY . .
RUN make build-revad-docker


FROM gitlab-registry.cern.ch/dss/eos/eos-all:4.8.91
COPY --from=builder /go/src/github/cs3org/reva/cmd/revad/revad /usr/bin/revad
RUN chmod +x /usr/bin/revad
RUN mkdir -p /etc/revad/ && \
touch /etc/revad/revad.toml

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /home/reva/cmd/revad/revad /usr/bin/revad
RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml

ENTRYPOINT [ "/usr/bin/revad" ]
CMD [ "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid" ]
3 changes: 3 additions & 0 deletions changelog/unreleased/fix-docker-eos.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: Fix revad-eos docker image which was failing to build

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

0 comments on commit 07198ea

Please sign in to comment.