From a3b674e1d527d1ec5f6acefddad3d5ef5130a635 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 26 Mar 2024 12:32:52 +0300
Subject: [PATCH] CMD /run.sh
---
Dockerfile | 4 +++-
run.sh | 14 ++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 run.sh
diff --git a/Dockerfile b/Dockerfile
index eebbdc8..ad93c65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -127,6 +127,8 @@ COPY --from=build /usr/lib/squid/ /usr/lib/squid/
COPY --from=build /usr/share/squid/ /usr/share/squid/
COPY --from=build /usr/sbin/squid /usr/sbin/squid
COPY --from=build /usr/bin/squidclient /usr/bin/squidclient
+
+COPY --chmod=755 run.sh /
RUN install -d -o squid -g squid \
/var/cache/squid \
@@ -144,4 +146,4 @@ EXPOSE 3128/tcp
USER squid
-CMD ["sh", "-c", "rm -f /var/run/squid/squid.pid ; /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
+CMD ["/run.sh"]
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..7586dd7
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -x
+
+# force remove pid
+if [ -e /var/run/squid/squid.pid ]; then
+ rm -f /var/run/squid/squid.pid
+fi
+
+# init cache
+/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
+
+# run squid
+exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1
\ No newline at end of file