From 88d7aa0bf520db6d2435451673ad0c3dafcfede2 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sun, 2 Feb 2020 23:35:13 +0300
Subject: [PATCH] use submodule

---
 .github/workflows/dockerimage.yml | 14 ++++++++++++++
 .gitmodules                       |  4 ++++
 Dockerfile                        | 26 +++-----------------------
 squid                             |  1 +
 4 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 squid

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 719d057..6fefe44 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -19,6 +19,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     
+    - name: Checkout submodules
+      shell: bash
+      run: |
+        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+        git submodule sync --recursive
+        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+    
     - name: Build squid image
       run: docker build . --file Dockerfile --tag b4tman/squid
     
@@ -35,6 +42,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     
+    - name: Checkout submodules
+      shell: bash
+      run: |
+        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+        git submodule sync --recursive
+        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+    
     - name: Build squid image
       run: docker build . --file Dockerfile --tag b4tman/squid
     
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d717867
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "squid"]
+	path = squid
+	url = https://github.com/squid-cache/squid
+	branch = v5
diff --git a/Dockerfile b/Dockerfile
index 7ec6079..4c948dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM alpine:3.11.3 as build
 
-ENV SQUID_VER 5.0.1
-ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
-
 RUN set -x && \
 	apk add --no-cache  \
 		gcc \
@@ -21,26 +18,10 @@ RUN set -x && \
 		libcap-dev \
 		linux-headers
 
+COPY squid/ /tmp/build/
+WORKDIR /tmp/build/
+
 RUN set -x && \
-	mkdir -p /tmp/build && \
-	cd /tmp/build && \
-    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
-	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc
-	
-RUN set -x && \
-	cd /tmp/build && \
-	export GNUPGHOME="$(mktemp -d)" && \
-	( \
-	 gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${SQUID_SIG_KEY} || \
-     gpg --keyserver hkp://ipv4.pool.sks-keyservers.net   --recv-keys ${SQUID_SIG_KEY} ||  \
-     gpg --keyserver hkp://pgp.mit.edu:80                 --recv-keys ${SQUID_SIG_KEY} \
-	) && \
-	gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
-	rm -rf "$GNUPGHOME"
-	
-RUN set -x && \
-	cd /tmp/build && \	
-	tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
 	\
 	CFLAGS="-g0 -O2" \
 	CXXFLAGS="-g0 -O2" \
@@ -94,7 +75,6 @@ RUN set -x && \
 		--with-pidfile=/var/run/squid/squid.pid
 
 RUN set -x && \
-	cd /tmp/build && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
 
diff --git a/squid b/squid
new file mode 160000
index 0000000..8a511d5
--- /dev/null
+++ b/squid
@@ -0,0 +1 @@
+Subproject commit 8a511d5e05aa17b47c7566839fd9c524512489d3