update squid

squid/Dockerfile

@@ -2,11 +2,12 @@
 # Dockerfile for squid
 #
 
-FROM alpine
-MAINTAINER kev <noreply@easypi.pro>
+FROM alpine:3
+
+MAINTAINER EasyPi Software Foundation
 
 RUN apk add --no-cache squid
 
-EXPOSE 3128 3130
+EXPOSE 3128/tcp 3130/udp
 
 ENTRYPOINT ["/usr/sbin/squid", "-NYCd1"]

squid/README.md

@@ -15,25 +15,25 @@ including Windows and is licensed under the GNU GPL.
 squid:
   image: vimagick/squid
   ports:
-    - "3128:3128"
-    - "3130:3130"
+    - "3128:3128/tcp"
+    - "3130:3130/udp"
   ulimits:
     nofile:
-      soft: 65535
-      hard: 65535
-  restart: always
+      soft: 65536
+      hard: 65536
+  restart: unless-stopped
 ```
 
-> You can mount `squid.conf` file.
+> You can mount `/etc/squid/squid.conf` file.
 
 ## Up and Running
 
-```
+```bash
 # server
 $ docker-compose up -d
 
 # client
-$ curl -x https://localhost:3128 https://www.google.com/
+$ curl -x https://127.0.0.1:3128 https://www.google.com/
 ```
 
 [1]: http://www.squid-cache.org/

squid/arm/Dockerfile

@@ -2,11 +2,12 @@
 # Dockerfile for squid-arm
 #
 
-FROM easypi/alpine-arm:edge
+FROM arm32v7/alpine:3
+
 MAINTAINER EasyPi Software Foundation
 
 RUN apk add --no-cache squid
 
-EXPOSE 3128 3130
+EXPOSE 3128/tcp 3130/udp
 
 ENTRYPOINT ["/usr/sbin/squid", "-NYCd1"]

squid/arm/docker-compose.yml

@@ -1,13 +1,12 @@
 squid:
   image: easypi/squid-arm
   ports:
-    - "3128:3128"
-    - "3130:3130"
+    - "3128:3128/tcp"
+    - "3130:3130/udp"
   volumes:
-    - ./squid.conf:/etc/squid/squid.conf
-  net: host
+    - ./data/squid.conf:/etc/squid/squid.conf
   ulimits:
     nofile:
-      soft: 65535
-      hard: 65535
-  restart: always
+      soft: 65536
+      hard: 65536
+  restart: unless-stopped

squid/docker-compose.yml

@@ -1,10 +1,10 @@
 squid:
   image: vimagick/squid
   ports:
-    - "3128:3128"
-    - "3130:3130"
+    - "3128:3128/tcp"
+    - "3130:3130/udp"
   ulimits:
     nofile:
-      soft: 65535
-      hard: 65535
-  restart: always
+      soft: 65536
+      hard: 65536
+  restart: unless-stopped