Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix eos dockerfile #3036

Merged
merged 1 commit into from
Jul 7, 2022
Merged

fix eos dockerfile #3036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions Dockerfile.revad-eos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
6 changes: 6 additions & 0 deletions changelog/unreleased/fix-eos-docker-image.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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