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

Improve Dockerfile.revad-eos #3197

Merged
merged 13 commits into from
Dec 2, 2022
Merged

Improve Dockerfile.revad-eos #3197

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
082bf44
docker-revad-eos: Use eos-all:4.8.91 as base image
ebocchi Sep 6, 2022
02fe4e9
docker-revad-eos: Don't you update
ebocchi Sep 6, 2022
5bf62a7
docker-revad-eos: Sort and split install packages
ebocchi Sep 6, 2022
e2ee637
docker-revad-eos: Small refeactor for readability
ebocchi Sep 6, 2022
9f653fc
docker-revad-eos: Build revad binary on eos-all image (due to missing…
ebocchi Sep 6, 2022
7c90ef2
docker-revad-eos: Add changelog
ebocchi Sep 7, 2022
5f9c933
Update changelog/unreleased/dockerfile.revad-eos.md
jimil749 Nov 18, 2022
61f6e03
Update dockerfile.revad-eos.md
jimil749 Nov 18, 2022
5993c71
Merge branch 'master-merge' into dockerfile-revad-eos
ebocchi Dec 2, 2022
9755c97
docker-revad-eos: Fix linter
ebocchi Dec 2, 2022
bca1ee0
docker-revad-eos: Use eos-fusex image
ebocchi Dec 2, 2022
259039c
docker-revad-eos: Fix linter (again)
ebocchi Dec 2, 2022
97139b0
docker-revad-eos: Fix linter (againx2)
ebocchi Dec 2, 2022
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
20 changes: 11 additions & 9 deletions Dockerfile.revad-eos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
# 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
FROM gitlab-registry.cern.ch/dss/eos/eos-fusex:4.8.91 as builder

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 && \
RUN yum -y install \
gcc \
git \
golang \
make && \
yum clean all && \
rm -rf /var/cache/yum

Expand All @@ -34,15 +35,16 @@ RUN rm -rf /usr/local/go && \

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 /usr/bin/revad
RUN make build-revad-docker

RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
RUN mkdir -p /usr/local/bin

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

ENTRYPOINT [ "/usr/bin/revad" ]
CMD [ "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid" ]
12 changes: 12 additions & 0 deletions changelog/unreleased/dockerfile.revad-eos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Enhancement: Bring back multi-stage build to save on image size

- Use EOS 4.8.91 as base image
- Bring back multi-stage build
- Build revad on the eos 4.8.91 image due to missing dependency (`ld-musl-x86_64.so.1`, typical of alpine)
- Copy the resulting revad from the builder container

Resulting image size (unpacked on disk) is 2.59GB
- eos-all:4.8.91 is 2.47GB
- existing revad:latest-eos is 6.18GB

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