Ubuntu Docker Images

Merge ~athos-ribeiro/ubuntu-docker-images/+git/squid:4.10-20.04-nofile-fix into ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:4.10-20.04

  1. Git
  2. lp:~athos-ribeiro/ubuntu-docker-images/+git/squid
  3. 4.10-20.04-nofile-fix
  4. Merge into 4.10-20.04
Proposed by Athos Ribeiro
Status: Merged
Merged at revision: cdd4bdcdc90f2286da68b156a4ff33518a839787
Proposed branch: ~athos-ribeiro/ubuntu-docker-images/+git/squid:4.10-20.04-nofile-fix
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:4.10-20.04
Diff against target: 13 lines (+2/-0)
1 file modified
Dockerfile (+2/-0)
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Sergio Durigan Junior Pending
Canonical Server Pending
Review via email: mp+424766@code.launchpad.net

Description of the change

Follow up for 20.04 ROCK on LP: #1978272.

This is a cherry pick of the changes introduced in https://code.launchpad.net/~athos-ribeiro/ubuntu-docker-images/+git/squid/+merge/424521

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

Backport of squid MP: #424521, LGTM +1.

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Thanks, Bryce!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index e4f0217..30b15ed 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -12,6 +12,8 @@ RUN set -eux; \
6 rm -rf /var/lib/apt/lists/*; \
7 # Change default configuration to allow local network access \
8 sed -i 's/^#http_access allow localnet$/http_access allow localnet/' /etc/squid/conf.d/debian.conf; \
9+ echo "# Set max_filedescriptors to avoid using system's RLIMIT_NOFILE. See LP: #1978272" > /etc/squid/conf.d/rock.conf; \
10+ echo 'max_filedescriptors 1024' >> /etc/squid/conf.d/rock.conf; \
11 # smoketest
12 /usr/sbin/squid --version; \
13 # create manifest \

Subscribers

People subscribed via source and target branches