Ubuntu Docker Images

Merge ~valentinviennot/ubuntu-docker-images:update-squid-docs into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

  1. Git
  2. lp:~valentinviennot/ubuntu-docker-images
  3. update-squid-docs
  4. Merge into main
Proposed by Valentin Viennot
Status: Merged
Merged at revision: f20955b33ceb202634a47c7baf6dbcc143829a3f
Proposed branch: ~valentinviennot/ubuntu-docker-images:update-squid-docs
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
Diff against target: 56 lines (+12/-0)
4 files modified
data/squid.yaml (+6/-0)
docs/docker.io/ubuntu/squid.md (+2/-0)
docs/public.ecr.aws/lts/squid.md (+2/-0)
docs/public.ecr.aws/ubuntu/squid.md (+2/-0)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Review via email: mp+424074@code.launchpad.net

Commit message

Add squid missing documentation

Fixes https://bugs.launchpad.net/ubuntu-docker-images/+bug/1977586

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks for the MP, Valentin.

Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/squid.yaml b/data/squid.yaml
2index fb52624..e5c20f6 100644
3--- a/data/squid.yaml
4+++ b/data/squid.yaml
5@@ -52,6 +52,12 @@ parameters:
6 - type: -v
7 value: /path/to/data:/var/spool/squid
8 description: Volume to store the squid cache
9+ - type: -v
10+ value: /path/to/main/config:/etc/squid/squid.conf
11+ description: Main squid configuration file
12+ - type: -v
13+ value: /path/to/config/snippet:/etc/squid/conf.d/snippet.conf
14+ description: Configuration snippets included by squid.conf
15 debug:
16 - nothing
17 microk8s:
18diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md
19index 7dc7ebd..15c055f 100644
20--- a/docs/docker.io/ubuntu/squid.md
21+++ b/docs/docker.io/ubuntu/squid.md
22@@ -46,6 +46,8 @@ Access your Squid proxy at `localhost:3128`.
23 | `-p 3128:3128` | Expose the proxy service |
24 | `-v /path/to/logs:/var/log/squid` | Volume to store squid logs |
25 | `-v /path/to/data:/var/spool/squid` | Volume to store the squid cache |
26+| `-v /path/to/main/config:/etc/squid/squid.conf` | Main squid configuration file |
27+| `-v /path/to/config/snippet:/etc/squid/conf.d/snippet.conf` | Configuration snippets included by squid.conf |
28
29
30 #### Testing/Debugging
31diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md
32index d96244a..5ab66a1 100644
33--- a/docs/public.ecr.aws/lts/squid.md
34+++ b/docs/public.ecr.aws/lts/squid.md
35@@ -49,6 +49,8 @@ Access your Squid proxy at `localhost:3128`.
36 | `-p 3128:3128` | Expose the proxy service |
37 | `-v /path/to/logs:/var/log/squid` | Volume to store squid logs |
38 | `-v /path/to/data:/var/spool/squid` | Volume to store the squid cache |
39+| `-v /path/to/main/config:/etc/squid/squid.conf` | Main squid configuration file |
40+| `-v /path/to/config/snippet:/etc/squid/conf.d/snippet.conf` | Configuration snippets included by squid.conf |
41
42
43 #### Testing/Debugging
44diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md
45index eb36a24..41443da 100644
46--- a/docs/public.ecr.aws/ubuntu/squid.md
47+++ b/docs/public.ecr.aws/ubuntu/squid.md
48@@ -61,6 +61,8 @@ Access your Squid proxy at `localhost:3128`.
49 | `-p 3128:3128` | Expose the proxy service |
50 | `-v /path/to/logs:/var/log/squid` | Volume to store squid logs |
51 | `-v /path/to/data:/var/spool/squid` | Volume to store the squid cache |
52+| `-v /path/to/main/config:/etc/squid/squid.conf` | Main squid configuration file |
53+| `-v /path/to/config/snippet:/etc/squid/conf.d/snippet.conf` | Configuration snippets included by squid.conf |
54
55
56 #### Testing/Debugging

Subscribers

People subscribed via source and target branches