Compare commits

...

8 Commits

Author SHA1 Message Date
Paolo Asperti 20f7e33309
keep only latest docker release
continuous-integration/drone/tag Build is passing Details
2022-03-10 14:43:10 +01:00
Paolo Asperti 0d107f80e1
update drone
continuous-integration/drone/tag Build is passing Details
2021-12-12 22:08:49 +01:00
Paolo Asperti 4e305387fe
update OS 2021-12-12 22:08:40 +01:00
Paolo Asperti f51101c505 fix visible_hostname
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details
2020-12-14 10:16:06 +01:00
Paolo Asperti 50fc5bb4e9
Updated Alpine
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details
2020-09-23 08:32:42 +02:00
Paolo Asperti a59639e374
update debian os
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details
2019-11-07 11:16:57 +01:00
Paolo Asperti 6b05d23183
update alpine OS
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details
2019-11-07 11:11:13 +01:00
Paolo Asperti 7edc11a6ee
remove stale pid file on startup
continuous-integration/drone/push Build is passing Details
2019-09-10 15:28:47 +02:00
4 changed files with 28 additions and 60 deletions

View File

@ -1,77 +1,37 @@
kind: pipeline
type: docker
name: default
steps:
- name: build-alpine
image: plugins/docker:linux-amd64
pull: always
settings:
dockerfile: Dockerfile-alpine
daemon_off: false
dry_run: true
repo: docker.asperti.com/paspo/angry-squid
tags:
- latest
- alpine-latest
when:
event:
exclude:
- tag
- name: build-debian
image: plugins/docker:linux-amd64
pull: always
settings:
dockerfile: Dockerfile-debian
daemon_off: false
dry_run: true
repo: docker.asperti.com/paspo/angry-squid
tags:
- debian-latest
when:
event:
exclude:
- tag
- name: build_and_publish-alpine
image: plugins/docker:linux-amd64
pull: always
settings:
dockerfile: Dockerfile-alpine
auto_tag: true
auto_tag_suffix: alpine
force_tag: true
daemon_off: false
username:
from_secret: docker_username
password:
from_secret: docker_password
dockerfile: Dockerfile-alpine
registry: docker.asperti.com
repo: docker.asperti.com/paspo/angry-squid
tags:
- latest
- alpine-latest
username:
from_secret: docker_username
when:
event:
- tag
force_tag: true
- name: build_and_publish-debian
image: plugins/docker:linux-amd64
pull: always
settings:
dockerfile: Dockerfile-debian
auto_tag: true
auto_tag_suffix: debian
force_tag: true
daemon_off: false
username:
from_secret: docker_username
password:
from_secret: docker_password
dockerfile: Dockerfile-debian
registry: docker.asperti.com
repo: docker.asperti.com/paspo/angry-squid
tags:
- debian-latest
username:
from_secret: docker_username
when:
event:
- tag
force_tag: true
trigger:
event:
- tag

View File

@ -1,6 +1,7 @@
FROM alpine:3.10
FROM alpine:3.15
RUN apk -u add squid perl && \
RUN apk -U upgrade && \
apk add squid perl && \
mkdir -p /etc/squid/conf.d /etc/squid/patterns.d /etc/squid/storeid /app/storeid
COPY docker-stuff/start.sh /app/
@ -12,4 +13,4 @@ COPY storeid/* /app/storeid/
EXPOSE 3128
EXPOSE 3129
ENTRYPOINT ["/app/start.sh"]
ENTRYPOINT ["/app/start.sh"]

View File

@ -1,6 +1,7 @@
FROM debian:10
FROM debian:11
RUN apt-get update && \
apt-get -y upgrade && \
apt-get install -y squid && \
mkdir -p /etc/squid/patterns.d /etc/squid/storeid /app/storeid
@ -13,4 +14,4 @@ COPY storeid/* /app/storeid/
EXPOSE 3128
EXPOSE 3129
ENTRYPOINT ["/app/start.sh"]
ENTRYPOINT ["/app/start.sh"]

View File

@ -3,6 +3,10 @@
SQUID_CACHE_DIR=${SQUID_CACHE_DIR:-/var/spool/squid}
SQUID_COREDUMP_DIR=${SQUID_COREDUMP_DIR:-/var/cache/squid}
SQUID_CACHE_SIZE_MB=${SQUID_CACHE_SIZE_MB:-10240}
SQUID_HOSTNAME=${SQUID_HOSTNAME:-angrysquid.local}
PIDFILE=/var/run/squid.pid
if [ ! -d "${SQUID_CACHE_DIR}" ]; then
mkdir -p "${SQUID_CACHE_DIR}"
@ -17,12 +21,14 @@ fi
cat <<EOF >/etc/squid/conf.d/common.conf
cache_dir aufs ${SQUID_CACHE_DIR} ${SQUID_CACHE_SIZE_MB} 16 256
coredump_dir ${SQUID_COREDUMP_DIR}
visible_hostname ${SQUID_HOSTNAME}
EOF
if [ ! -d "${SQUID_CACHE_DIR}/00" ]; then
squid -z
squid -z
sleep 5
fi
squid
[ -e "${PIDFILE}" ] && rm "${PIDFILE}"
squid
tail -f /var/log/squid/access.log /var/log/squid/cache.log