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

Compare commits

merge into: NgTech-LTD:freddev
Branches Tags
NgTech-LTD:master
NgTech-LTD:freddev
...
pull from: NgTech-LTD:master
Branches Tags
NgTech-LTD:master
NgTech-LTD:freddev

20 Commits
freddev ... master

Author SHA1 Message Date
Fred
6da3c49222 Update 2 files 
- /gitlabci/docker-hub.yml
- /.gitlab-ci.yml
 2024-08-01 12:27:21 +00:00
Fred
c5a63a6730 Restore rights to tmpfs after tests 2024-08-01 09:29:59 +00:00
Fred
488423694d Update workflow message 2024-07-25 12:37:49 +00:00
Fred
d3c02afab5 Tunne pipeline name 2024-07-25 12:32:48 +00:00
Fred
8f3752c31f Tune workflow name 2024-07-25 12:31:54 +00:00
Fred
9d8c662a6c Fix rights 2024-07-24 12:26:27 +00:00
Fred
6b7527addb Update docker-hub.yml 2024-07-24 11:37:32 +00:00
Fred
94323b7689 Update docker-hub.yml 2024-07-24 11:33:41 +00:00
Fred
6315a4a1b3 Update docker-hub.yml 2024-07-24 11:09:30 +00:00
Fred
4dbf12199b fix 2024-07-24 11:08:05 +00:00
Fred
f31ea2e3b7 test 2024-07-24 11:02:49 +00:00
Fred
49f6380114 fix 2024-07-24 10:55:04 +00:00
Fred
0124ee1201 Fix 2024-07-24 10:50:50 +00:00
Fred
436c70b19d test 2024-07-24 10:38:39 +00:00
Fred
f7e556aea6 fix CI_BUILDS_DIR 2024-07-24 10:33:32 +00:00
Fred
f9a0b126b5 Remove test with $CI_BUILDS_DIR 2024-07-24 09:15:20 +00:00
Fred
edd0729adc Test 2024-07-24 09:11:21 +00:00
Fred
b76abecedb Test move $CI_BUILDS_DIR 2024-07-24 09:10:04 +00:00
Fred
1864764d77 Add multi cores to make 2024-07-22 14:21:44 +00:00
Fred
2fa9599095 Hard code pid path 2024-05-02 14:30:03 +00:00
4 changed files with 16 additions and 15 deletions
Show Stats Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -2,9 +2,16 @@ workflow:
rules: rules:
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
workflow:
name: "$CI_COMMIT_TITLE: Squid auto rebuild docker from http://www.squid-cache.org/Versions images https://hub.docker.com/r/fredbcode"
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
# Build on tmpfs
variables:
GIT_CLONE_PATH: $CI_BUILDS_DIR/tmpfs/$CI_PROJECT_NAME/$CI_COMMIT_BRANCH
stages: stages:
- quality - quality
- Docker-hub-build - Docker-hub-build

4
Dockerfile
View File

@ -21,7 +21,7 @@ RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/ap
--enable-icap-support \ --enable-icap-support \
--enable-async-io \ --enable-async-io \
--with-pthreads \ --with-pthreads \
--with-winbind \ --with-winbind \
--bindir=/usr/sbin \ --bindir=/usr/sbin \
--sbindir=/usr/sbin \ --sbindir=/usr/sbin \
--with-squid=/usr/lib/squid \ --with-squid=/usr/lib/squid \
@ -54,7 +54,7 @@ RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/ap
--with-pidfile=/squid/squid.pid \ --with-pidfile=/squid/squid.pid \
--with-default-user=squid \ --with-default-user=squid \
--enable-removal-policies="lru,heap" \ --enable-removal-policies="lru,heap" \
&& make \ && make -j4 \
&& find /tmp/ -type f -name "Makefil*" -delete \ && find /tmp/ -type f -name "Makefil*" -delete \
&& find /tmp/ -type f -name "*.in" -delete && find /tmp/ -type f -name "*.in" -delete
# Install # Install

12
gitlabci/docker-hub.yml
View File

@ -19,14 +19,6 @@ docker-hub-build:
- docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 . - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 .
- docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64 - docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64
.standalone:
image:
name: $CONTAINER_BUILD_NOPROD_NAME_AMD64
entrypoint: [""]
variables:
GIT_STRATEGY: none
dependencies: []
.services-amd64: .services-amd64:
services: services:
- name: $CONTAINER_BUILD_NOPROD_NAME_AMD64 - name: $CONTAINER_BUILD_NOPROD_NAME_AMD64
@ -45,11 +37,13 @@ docker-hub-test:
SquidParseConfig: SquidParseConfig:
stage: Docker-hub-test stage: Docker-hub-test
extends: .standalone image:
name: $CONTAINER_BUILD_NOPROD_NAME_AMD64
script: script:
- /usr/sbin/squid -k parse /etc/squid/squid.conf - /usr/sbin/squid -k parse /etc/squid/squid.conf
# Stop if error # Stop if error
- "! /usr/sbin/squid -k parse /etc/squid/squid.conf 2>&1 | grep ERROR" - "! /usr/sbin/squid -k parse /etc/squid/squid.conf 2>&1 | grep ERROR"
dive: dive:
image: image:
name: wagoodman/dive:latest name: wagoodman/dive:latest

6
squid/run.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
if [ -e "/squid/squid.pid" ];then if [ -e "/run/squid.pid" ];then
echo "Squid pid: Already running ?" echo "Squid pid: Already running ?"
rm /squid/squid.pid rm /run/squid.pid
pkill squid pkill squid
exit 1 exit 1
fi fi
@ -17,7 +17,7 @@ else
touch "/var/spool/squid/$HOSTNAME" touch "/var/spool/squid/$HOSTNAME"
fi fi
while test -e /tmp/$HOSTNAME.pid while test -e /run/squid.pid
do do
echo "cache is generated/checked" echo "cache is generated/checked"
sleep 1 sleep 1