Skip to content
This repository has been archived by the owner on Jun 12, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fgrehm/squid3-ssl-docker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v20140623
Choose a base ref
...
head repository: fgrehm/squid3-ssl-docker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 24, 2014

  1. This has been done already

    fgrehm committed Jun 24, 2014
    Copy the full SHA
    766cee9 View commit details

Commits on Aug 9, 2014

  1. Copy the full SHA
    ac74eb1 View commit details
  2. Update README

    fgrehm committed Aug 9, 2014
    Copy the full SHA
    6f57cd2 View commit details
Showing with 7 additions and 11 deletions.
  1. +0 −7 Dockerfile
  2. +3 −3 README.md
  3. +4 −1 run
7 changes: 0 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -28,13 +28,6 @@ RUN cd /tmp && \
rm -rf /tmp/debs && \
apt-get clean

# Soon...
# RUN cd /tmp && \
# wget ...URL FROM GITHUB RELEASE... && \
# tar xzf squid3-20140505.tgz \
# dpkg -i debs/*.deb && \
# rm -rf /tmp/debs

# Create cache directory
VOLUME /var/cache/squid3

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ other Docker containers.
Start Squid3 setting its hostname and container name:

```
$ docker run -d -h proxy.docker.dev --name squid3 fgrehm/squid3-ssl
$ docker run -d -h proxy.docker.dev --name squid3 fgrehm/squid3-ssl:v20140809
```

Start another container linking it to the proxy container and setting the
@@ -51,7 +51,7 @@ CA certificate on an Ubuntu container, try these steps:

```
# Start Squid3 setting its hostname and container name:
$ docker run -d -h proxy.docker.dev --name squid3 fgrehm/squid3-ssl
$ docker run -d -h proxy.docker.dev --name squid3 fgrehm/squid3-ssl:v20140809
# Save the certificate into a file
$ docker logs squid3 | sed -n '/BEGIN/,/END/p' > proxy.docker.dev.crt
@@ -65,7 +65,7 @@ $ docker run -ti --rm \
ubuntu:trusty bash
# From within the container, trust the certificate
$ apt-get update && apt-get install -y ca-certificates
$ apt-get update && apt-get install -y ca-certificates curl
$ echo 'proxy.docker.dev.crt' >> /etc/ca-certificates.conf
$ /usr/sbin/update-ca-certificates
```
5 changes: 4 additions & 1 deletion run
Original file line number Diff line number Diff line change
@@ -8,7 +8,10 @@ sed -i "s|<HOST>|${HOST}|g" /etc/squid3/openssl.cnf
sed -i "s|<HOST>|${HOST}|g" /etc/squid3/squid.conf

mkdir -p /etc/squid3/certs
/usr/local/bin/mk-certs

if ! [ -f "/etc/squid3/certs/${HOST}.crt" ]; then
/usr/local/bin/mk-certs
fi

chown -R proxy: /etc/squid3/certs