Move scripts to directory
This commit is contained in:
parent
7566ffcfaf
commit
9547d18ac7
10
Dockerfile
10
Dockerfile
@ -51,7 +51,7 @@ RUN echo "deb-src http://deb.debian.org/debian bullseye main contrib" >> /etc/ap
|
||||
--with-filedescriptors=48000 \
|
||||
--enable-delay-pools \
|
||||
--with-large-files \
|
||||
--with-pidfile=/tmp/squid.pid \
|
||||
--with-pidfile=/squid/squid.pid \
|
||||
--with-default-user=squid \
|
||||
--enable-removal-policies="lru,heap" \
|
||||
&& make \
|
||||
@ -102,12 +102,10 @@ RUN adduser --no-create-home --uid 1161 --group --system squid \
|
||||
&& apt-get update && apt-get install -y --no-install-recommends ca-certificates net-tools rsync libexpat1 libltdl7 libxml2 openssl ca-certificates libldap-2.4-2 libecap3 libcap2 libdb5.3 libatomic1 dumb-init procps inotify-tools \
|
||||
&& apt-get auto-remove -y && apt-get clean autoclean \
|
||||
&& rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/*
|
||||
COPY run.sh /
|
||||
COPY autoreload.sh /
|
||||
COPY sup.sh /
|
||||
RUN chmod +x /run.sh /autoreload.sh /sup.sh
|
||||
COPY --chown=1161 squid /squid
|
||||
RUN chmod +x /squid/run.sh /squid/autoreload.sh /squid/sup.sh
|
||||
HEALTHCHECK CMD squidclient mgr:info | grep "HTTP/1.1 200 OK" || exit 1
|
||||
EXPOSE 3128
|
||||
ENTRYPOINT ["dumb-init"]
|
||||
USER squid
|
||||
CMD ["bash", "-c", "/run.sh && squid -N -n $HOSTNAME"]
|
||||
CMD ["bash", "-c", "/squid/run.sh && squid -N -n $HOSTNAME"]
|
||||
|
||||
@ -40,6 +40,8 @@ docker-compose up --scale squid=4 -d
|
||||
|
||||
**UID/GUID:**
|
||||
|
||||
For security purpose image runs as a non-root user
|
||||
|
||||
- 1161
|
||||
|
||||
**Persistence**
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ -e "/tmp/squid.pid" ];then
|
||||
if [ -e "/squid/squid.pid" ];then
|
||||
echo "Squid pid: Already running ?"
|
||||
rm /tmp/squid.pid
|
||||
rm /squid/squid.pid
|
||||
pkill squid
|
||||
exit 1
|
||||
fi
|
||||
@ -27,7 +27,7 @@ done
|
||||
# if env sup
|
||||
|
||||
# Run sup: IN BACKGROUND
|
||||
/sup.sh &
|
||||
/squid/sup.sh &
|
||||
|
||||
if [ $(grep -c "\-s\ /certs" /etc/squid/squid.conf) -ne 0 ];then
|
||||
if [ ! -d /certs/ssl_db ]; then
|
||||
@ -38,5 +38,5 @@ fi
|
||||
|
||||
echo "Starting: squid"
|
||||
# Run autoreload: IN BACKGROUND
|
||||
/autoreload.sh &
|
||||
/squid/autoreload.sh &
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
#!/bin/bash
|
||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||
set -vx
|
||||
if [ -z "$supgethosts" ] && [ -z "$supicaphost" ]; then
|
||||
exit 0
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user