NgTech-LTD/fredbcode-images-squid
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dumb-init for pid 1

Browse Source
This commit is contained in:
fredbcode 2021-11-02 11:35:47 +01:00
parent c16f517e85
commit df2c84a2de
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -100,7 +100,7 @@ RUN adduser --no-create-home --uid 1161 --group --system squid \
&& echo "cache_log /var/log/squid/cache.log" >> /etc/squid/squid.conf \
&& echo "cache_effective_user squid" >> /etc/squid/squid.conf \
# Packages dependencies installation for running and clean again
&& 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 \
&& 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 \
&& apt-get auto-remove -y && apt-get clean autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/*
@ -108,4 +108,5 @@ COPY run.sh /
RUN chmod +x /run.sh
HEALTHCHECK CMD squidclient mgr:index | grep "HTTP/1.1 200 OK" || exit 1
EXPOSE 3128
ENTRYPOINT ["/run.sh"]
ENTRYPOINT ["dumb-init"]
CMD ["bash", "-c", "/run.sh && squid -N -n $HOSTNAME"]

2
gitlabci/docker-hub-arm.yml
View File

@ -66,7 +66,7 @@ push-docker-hub-arm:
- export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g')
- docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm
- docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm
- docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:latest-arm
- docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:latest
- docker push $HUB_REGISTRY_IMAGE:latest-arm
variables:
GIT_STRATEGY: none

2
gitlabci/docker-hub.yml
View File

@ -58,7 +58,7 @@ push-docker-hub:
- export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g')
- docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64
- docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64
- docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest-amd64
- docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest
- docker push $HUB_REGISTRY_IMAGE:latest-amd64
variables:
GIT_STRATEGY: none

5
run.sh
View File

@ -32,10 +32,7 @@ do
sleep 1
done
# Find and remove old useless caches directories (not used after limi valuet). sleep is only used to wait other containers are well started.
# Find and remove old useless caches directories (not used after "LIMIT" value). sleep is only used to wait other containers are well started.
mkdir /tmp/empty
sleep 20 && find /var/cache/squid/* -maxdepth 0 -type d $LIMIT -exec rsync -a -v --delete /tmp/empty/ {}/ \; && rm -d /var/cache/squid/* 2>/dev/null &
# Exec swicth squid to pid 1
exec squid -N -n $HOSTNAME