From 8753b841427d58129b39e2c092548189eca0a080 Mon Sep 17 00:00:00 2001
From: jpizarrom <jpizarrom@gmail.com>
Date: Fri, 4 Nov 2016 10:33:47 -0300
Subject: [PATCH] Up 3.5.20 r0 (#1)

* upgrade squid 3.5.19-r1

* upgrade to 3.5.20-r0
---
 3.5.17/Dockerfile           | 13 ----------
 3.5.17/conf/squid.conf      | 48 -------------------------------------
 3.5.17/docker-entrypoint.sh | 15 ------------
 Dockerfile                  |  4 ++--
 4 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 3.5.17/Dockerfile
 delete mode 100644 3.5.17/conf/squid.conf
 delete mode 100644 3.5.17/docker-entrypoint.sh

diff --git a/3.5.17/Dockerfile b/3.5.17/Dockerfile
deleted file mode 100644
index ff04511..0000000
--- a/3.5.17/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM alpine:3.3
-MAINTAINER Stephen Bunn "scbunn@sbunn.org"
-
-COPY docker-entrypoint.sh /
-RUN apk update &&\
-    apk add --no-cache su-exec &&\
-    apk add --no-cache squid=3.5.17-r0 && \
-    mkdir -p /var/cache/squid &&\
-    chmod +x /docker-entrypoint.sh
-COPY conf/squid.conf /etc/squid/squid.conf
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD [ "squid" ]
-EXPOSE 3128 3130
diff --git a/3.5.17/conf/squid.conf b/3.5.17/conf/squid.conf
deleted file mode 100644
index f92d11d..0000000
--- a/3.5.17/conf/squid.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# ----------------------------------------------------------------------------
-# Basic squid configuration
-# ----------------------------------------------------------------------------
-
-# common settings
-# ---------------
-http_port 3128
-cache_effective_user squid
-cache_effective_group squid
-workers 1
-
-# Standard ACL configuration
-# --------------------------
-
-# Allow proxing standard web traffic only
-acl SSL_ports port 443
-acl Safe_ports port 80
-acl Safe_ports port 443
-acl CONNECT method CONNECT
-
-# ACLs to target for logging
-acl success_codes http_status 100-199 # informational
-acl success_codes http_status 200-299 # successful transactions
-acl success_codes http_status 300-399 # redirection
-acl failure_codes http_status 400-499 # client error
-acl failure_codes http_status 500-599 # server error
-acl success_hier hier_code HIER_DIRECT
-acl failure_hier hier_code HIER_NONE
-acl failure all-of CONNECT failure_hier
-acl failure all-of !CONNECT failure_codes
-acl success all-of CONNECT success_hier
-acl success all-of !CONNECT success_codes
-
-# ACL operators
-# -------------
-http_access allow localhost
-http_access deny to_localhost
-http_access deny CONNECT !Safe_ports
-http_access deny CONNECT !SSL_ports
-http_access deny !Safe_ports
-http_access allow Safe_ports
-http_access deny all
-
-# Logging configuration
-# ---------------------
-log_mime_hdrs on
-access_log daemon:/var/log/squid/access.log squid !success
-cache_log /var/log/squid/cache.log
diff --git a/3.5.17/docker-entrypoint.sh b/3.5.17/docker-entrypoint.sh
deleted file mode 100644
index bd4e475..0000000
--- a/3.5.17/docker-entrypoint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# entrypoint for squid container
-# ----------------------------------------------------------------------------
-set -e
-
-SQUID_VERSION=$(/usr/sbin/squid -v | grep Version | awk '{ print $4 }')
-if [ "$1" == "squid" ]; then
-  echo "Staring squid [${SQUID_VERSION}]"
-  chown -R squid:squid /var/cache/squid
-  exec /sbin/su-exec root /usr/sbin/squid -N
-else
-  exec "$@"
-fi
-
diff --git a/Dockerfile b/Dockerfile
index ff04511..fee4790 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM alpine:3.3
+FROM alpine:3.4
 MAINTAINER Stephen Bunn "scbunn@sbunn.org"
 
 COPY docker-entrypoint.sh /
 RUN apk update &&\
     apk add --no-cache su-exec &&\
-    apk add --no-cache squid=3.5.17-r0 && \
+    apk add --no-cache squid=3.5.20-r0 && \
     mkdir -p /var/cache/squid &&\
     chmod +x /docker-entrypoint.sh
 COPY conf/squid.conf /etc/squid/squid.conf