diff --git a/changelog/unreleased/fix-eos-container-build.md b/changelog/unreleased/fix-eos-container-build.md new file mode 100644 index 0000000000..3cb804f28d --- /dev/null +++ b/changelog/unreleased/fix-eos-container-build.md @@ -0,0 +1,3 @@ +Bugfix: Fix ulimits for EOS container deployment + +https://github.com/cs3org/reva/pull/4620 diff --git a/docker/Dockerfile.revad-ceph b/docker/Dockerfile.revad-ceph index 8d6fc2e244..a190c20199 100644 --- a/docker/Dockerfile.revad-ceph +++ b/docker/Dockerfile.revad-ceph @@ -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 \ diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index bb54bc3ba7..334955260b 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -20,7 +20,7 @@ services: - seccomp:unconfined ulimits: nproc: 57875 - nofile: 1024 + nofile: 1024000 core: -1 privileged: true sysctls: diff --git a/tests/docker/eos-storage/Dockerfile b/tests/docker/eos-storage/Dockerfile index 8afb99af03..587331fa0d 100644 --- a/tests/docker/eos-storage/Dockerfile +++ b/tests/docker/eos-storage/Dockerfile @@ -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 \ No newline at end of file +ENTRYPOINT /mnt/scripts/eos-run.sh