Merge branch 'master' into v6

force remove PID file on startup
to fix #104
2024-10-22 22:15:05 +00:00 · 2023-07-07 09:27:42 +03:00 · 2023-07-07 09:09:42 +03:00
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -148,4 +148,4 @@ EXPOSE 3128/tcp
 USER squid
-CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
+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"]
Author	SHA1	Message	Date
Dmitry	00501dcfd9	Merge branch 'master' into v6	2023-07-07 09:27:42 +03:00
Dmitry	e108ff41f6	force remove PID file on startup to fix #104	2023-07-07 09:09:42 +03:00
`@ -148,4 +148,4 @@ EXPOSE 3128/tcp`

	`USER squid`	`USER squid`

	`CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]`	`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"]`