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

docker: fix ulimits for eos container #4620

Merged
merged 5 commits into from
Apr 8, 2024
Merged

docker: fix ulimits for eos container #4620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73435d9
docker: fix ulimits for eos container
labkode Apr 8, 2024
7af864c
add changelog
labkode Apr 8, 2024
21de397
restore command
labkode Apr 8, 2024
ffc01ad
use upstream ceph repo
labkode Apr 8, 2024
25c0d8d
improve docs
labkode Apr 8, 2024
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
3 changes: 3 additions & 0 deletions changelog/unreleased/fix-eos-container-build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix: Fix ulimits for EOS container deployment

https://github.com/cs3org/reva/pull/4620
3 changes: 0 additions & 3 deletions docker/Dockerfile.revad-ceph
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

FROM quay.io/ceph/ceph:v18

# 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 \
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- seccomp:unconfined
ulimits:
nproc: 57875
nofile: 1024
nofile: 1024000
core: -1
privileged: true
sysctls:
Expand Down
12 changes: 10 additions & 2 deletions tests/docker/eos-storage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# Changing ulimits inside the container may not be allowed.
# This container is usually called from docker compose,
# where the ulimits are set in the docker compose file.
# If the container needs to be run manually, the following flag
# needs to be passed, else the container will run out of fd.
# docker run myeoscontainer --ulimit nofiles:1024000:1024000

FROM gitlab-registry.cern.ch/dss/eos/eos-ci:5.1.25

COPY scripts/eos-run.sh /mnt/scripts/eos-run.sh
COPY sssd/sssd.conf /etc/sssd/sssd.conf

RUN ulimit -n 1024000 && yum install -y sssd sssd-client

RUN yum install -y sssd sssd-client

RUN chmod 0600 /etc/sssd/sssd.conf && chown root:root /etc/sssd/sssd.conf

ENTRYPOINT /mnt/scripts/eos-run.sh
ENTRYPOINT /mnt/scripts/eos-run.sh
Loading