Adapt sameersbn role to meet StackHPC requirements

Author: oneswig

Dockerfile

@@ -1,17 +1,21 @@
-FROM ubuntu:bionic-20190612
-LABEL maintainer="sameer@damagehead.com"
+FROM centos:centos7
+MAINTAINER StackHPC
 
-ENV SQUID_VERSION=3.5.27 \
+ENV SQUID_VERSION=3.5.20 \
     SQUID_CACHE_DIR=/var/spool/squid \
     SQUID_LOG_DIR=/var/log/squid \
-    SQUID_USER=proxy
+    SQUID_USER=squid
 
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y squid=${SQUID_VERSION}* \
- && rm -rf /var/lib/apt/lists/*
+RUN yum install -y \
+    which \
+    squid-${SQUID_VERSION}
+
+COPY squid.conf /etc/squid/squid.conf
+RUN chown root.squid /etc/squid/squid.conf
+RUN chmod 0640 /etc/squid/squid.conf
 
 COPY entrypoint.sh /sbin/entrypoint.sh
-RUN chmod 755 /sbin/entrypoint.sh
+RUN chmod 0755 /sbin/entrypoint.sh
 
 EXPOSE 3128/tcp
 ENTRYPOINT ["/sbin/entrypoint.sh"]

README.md

@@ -1,6 +1,4 @@
-[![Circle CI](https://circleci.com/gh/sameersbn/docker-squid.svg?style=shield)](https://circleci.com/gh/sameersbn/docker-squid) [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/squid/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/squid)
-
-# sameersbn/squid:3.5.27-2
+# stackhpc/squid:3.5.20
 
 - [Introduction](#introduction)
   - [Contributing](#contributing)
@@ -23,13 +21,20 @@
 
 Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator.
 
+Based on the Squid container by [sameersbn](https://github.com/sameersbn/docker-squid), with some changes:
+
+- Based on CentOS base image and packages
+- Uses a disk cache (4 GB) in `/var/spool/squid`
+- Configures for logging to files under `/var/log/squid`
+- Raises the RAM cache to 768 MB (default is 256 MB)
+- Raises the maximum object size to 16 MB (default is 512 KB)
+
 ## Contributing
 
 If you find this image useful here's how you can help:
 
 - Send a pull request with your awesome features and bug fixes
 - Help users resolve their [issues](../../issues?q=is%3Aopen+is%3Aissue).
-- Support the development of this image with a [donation](http://www.damagehead.com/donate/)
 
 ## Issues
 
@@ -47,18 +52,14 @@ If the above recommendations do not help then [report your issue](../../issues/n
 
 ## Installation
 
-Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/squid) and is the recommended method of installation.
-
-> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/squid)
-
 ```bash
-docker pull sameersbn/squid:3.5.27-2
+docker pull stackhpc/squid:3.5.20-1
 ```
 
 Alternatively you can build the image yourself.
 
 ```bash
-docker build -t sameersbn/squid github.com/sameersbn/docker-squid
+docker build -t stackhpc/squid github.com/stackhpc/docker-squid
 ```
 
 ## Quickstart
@@ -68,8 +69,9 @@ Start Squid using:
 ```bash
 docker run --name squid -d --restart=always \
   --publish 3128:3128 \
+  --volume /srv/docker/squid/log:/var/log/squid \
   --volume /srv/docker/squid/cache:/var/spool/squid \
-  sameersbn/squid:3.5.27-2
+  stackhpc/squid:3.5.20-1
 ```
 
 *Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)*
@@ -81,8 +83,9 @@ You can customize the launch command of the Squid server by specifying arguments
 ```bash
 docker run --name squid -it --rm \
   --publish 3128:3128 \
+  --volume /srv/docker/squid/log:/var/log/squid \
   --volume /srv/docker/squid/cache:/var/spool/squid \
-  sameersbn/squid:3.5.27-2 -h
+  stackhpc/squid:3.5.20-1 -h
 ```
 
 ## Persistence
@@ -107,7 +110,7 @@ docker run --name squid -d --restart=always \
   --publish 3128:3128 \
   --volume /path/to/squid.conf:/etc/squid/squid.conf \
   --volume /srv/docker/squid/cache:/var/spool/squid \
-  sameersbn/squid:3.5.27-2
+  stackhpc/squid:3.5.20-1
 ```
 
 To reload the Squid configuration on a running instance you can send the `HUP` signal to the container.
@@ -155,7 +158,7 @@ To upgrade to newer releases:
   1. Download the updated Docker image:
 
   ```bash
-  docker pull sameersbn/squid:3.5.27-2
+  docker pull stackhpc/squid:3.5.20-1
   ```
 
   2. Stop the currently running image:
@@ -175,7 +178,7 @@ To upgrade to newer releases:
   ```bash
   docker run -name squid -d \
     [OPTIONS] \
-    sameersbn/squid:3.5.27-2
+    stackhpc/squid:3.5.20-1
   ```
 
 ## Shell Access

entrypoint.sh

@@ -31,7 +31,7 @@ if [[ -z ${1} ]]; then
     $(which squid) -N -f /etc/squid/squid.conf -z
   fi
   echo "Starting squid..."
-  exec $(which squid) -f /etc/squid/squid.conf -NYCd 1 ${EXTRA_ARGS}
+  exec $(which squid) -f /etc/squid/squid.conf -NYC ${EXTRA_ARGS}
 else
   exec "$@"
 fi

squid.conf

@@ -0,0 +1,75 @@
+#
+# Recommended minimum configuration:
+#
+
+# Example rule allowing access from your local networks.
+# Adapt to list your (internal) IP networks from where browsing
+# should be allowed
+acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
+acl localnet src 172.16.0.0/12	# RFC1918 possible internal network
+acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
+acl localnet src fc00::/7       # RFC 4193 local private network range
+acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
+
+acl SSL_ports port 443
+acl Safe_ports port 80		# http
+acl Safe_ports port 21		# ftp
+acl Safe_ports port 443		# https
+acl Safe_ports port 70		# gopher
+acl Safe_ports port 210		# wais
+acl Safe_ports port 1025-65535	# unregistered ports
+acl Safe_ports port 280		# http-mgmt
+acl Safe_ports port 488		# gss-http
+acl Safe_ports port 591		# filemaker
+acl Safe_ports port 777		# multiling http
+acl CONNECT method CONNECT
+
+#
+# Recommended minimum Access Permission configuration:
+#
+# Deny requests to certain unsafe ports
+http_access deny !Safe_ports
+
+# Deny CONNECT to other than secure SSL ports
+http_access deny CONNECT !SSL_ports
+
+# Only allow cachemgr access from localhost
+http_access allow localhost manager
+http_access deny manager
+
+# We strongly recommend the following be uncommented to protect innocent
+# web applications running on the proxy server who think the only
+# one who can access services on "localhost" is a local user
+#http_access deny to_localhost
+
+#
+# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+#
+
+# Example rule allowing access from your local networks.
+# Adapt localnet in the ACL section to list your (internal) IP networks
+# from where browsing should be allowed
+http_access allow localnet
+http_access allow localhost
+
+# And finally deny all other access to this proxy
+http_access deny all
+
+# Squid normally listens to port 3128
+http_port 3128
+
+# Uncomment and adjust the following to add a disk cache directory.
+cache_dir ufs /var/spool/squid 4096 16 256
+cache_mem 768 MB
+maximum_object_size_in_memory 32 MB
+
+# Leave coredumps in the first cache dir
+coredump_dir /var/spool/squid
+
+#
+# Add any of your own refresh_pattern entries above these.
+#
+refresh_pattern ^ftp:		1440	20%	10080
+refresh_pattern ^gopher:	1440	0%	1440
+refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+refresh_pattern .		0	20%	4320