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

fix ceph build #4557

Merged
merged 1 commit into from
Mar 5, 2024
Merged

fix ceph build #4557

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
2 changes: 1 addition & 1 deletion Dockerfile.revad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ COPY . .
RUN make build-revad-docker && \
cp /go/src/github/cs3org/reva/cmd/revad/revad /go/bin/revad

RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml

FROM golang:1.21-alpine3.18

Expand Down
22 changes: 16 additions & 6 deletions Dockerfile.revad-ceph
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,22 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM quay.io/ceph/ceph:v16
FROM quay.io/ceph/ceph:v18

RUN dnf update --exclude=ceph-iscsi -y && dnf install -y \
# replace repo url with one that allows downloading the repo metadata
# if http://download.ceph.com/rpm-reef/el8/x86_64/repodata/repomd.xml works again this can be dropped
RUN sed -i 's/download.ceph.com/de.ceph.com/' /etc/yum.repos.d/ceph.repo
RUN mkdir -p /etc/selinux/config

RUN dnf update --exclude=ceph-iscsi,chrony -y && dnf install -y \
git \
gcc \
make \
libcephfs-devel \
librbd-devel \
librados-devel

ADD https://golang.org/dl/go1.21.5.linux-amd64.tar.gz \
ADD https://go.dev/dl/go1.21.5.linux-amd64.tar.gz \
go1.21.5.linux-amd64.tar.gz

RUN rm -rf /usr/local/go && \
Expand All @@ -38,13 +43,18 @@ ENV GOPATH /go

WORKDIR /go/src/github/cs3org/reva
COPY . .

ARG GIT_COMMIT
ARG VERSION
ENV GIT_COMMIT=$GIT_COMMIT
ENV VERSION=$VERSION
RUN mkdir -p /go/bin && \
make build-revad-cephfs-docker && \
cp /go/src/github/cs3org/reva/cmd/revad/revad /usr/bin/revad
make build-revad-cephfs-docker && \
cp /go/src/github/cs3org/reva/cmd/revad/revad /usr/bin/revad

RUN cp -r examples/ceph /etc/

RUN mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml

EXPOSE 9999 10000

Expand Down
3 changes: 3 additions & 0 deletions changelog/unreleased/fix-ceph-build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: Fix ceph build

https://github.com/cs3org/reva/pull/4557
Loading