Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Paolo Asperti | 20f7e33309 | |
Paolo Asperti | 0d107f80e1 | |
Paolo Asperti | 4e305387fe | |
Paolo Asperti | f51101c505 |
66
.drone.yml
66
.drone.yml
|
@ -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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM alpine:3.12
|
||||
FROM alpine:3.15
|
||||
|
||||
RUN apk -U upgrade && \
|
||||
apk add squid perl && \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM debian:10
|
||||
FROM debian:11
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get -y upgrade && \
|
||||
|
@ -14,4 +14,4 @@ COPY storeid/* /app/storeid/
|
|||
EXPOSE 3128
|
||||
EXPOSE 3129
|
||||
|
||||
ENTRYPOINT ["/app/start.sh"]
|
||||
ENTRYPOINT ["/app/start.sh"]
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
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
|
||||
|
||||
|
@ -20,6 +21,7 @@ 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
|
||||
|
|
Loading…
Reference in New Issue