mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-09-08 10:27:36 +00:00
Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
ba0d25813e
|
|||
f1c7c6796f | |||
|
0e581bd499 | ||
|
bc32b5d1da | ||
|
7e71d6c43b |
@@ -17,6 +17,8 @@ steps:
|
|||||||
username: b4tman
|
username: b4tman
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
|
config:
|
||||||
|
from_secret: docker_config
|
||||||
- name: squid-armhf image for github packages
|
- name: squid-armhf image for github packages
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
@@ -27,6 +29,8 @@ steps:
|
|||||||
username: b4tman
|
username: b4tman
|
||||||
password:
|
password:
|
||||||
from_secret: github_password
|
from_secret: github_password
|
||||||
|
config:
|
||||||
|
from_secret: docker_config
|
||||||
trigger:
|
trigger:
|
||||||
ref:
|
ref:
|
||||||
- refs/tags/**
|
- refs/tags/**
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
FROM alpine:3.13.1 as build
|
FROM alpine:3.13.5 as build
|
||||||
|
|
||||||
ENV SQUID_VER 4.14
|
ENV SQUID_VER 4.15
|
||||||
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
|
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
|
||||||
|
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
@@ -104,7 +104,7 @@ RUN set -x && \
|
|||||||
RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
|
RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
|
||||||
RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
|
RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
|
||||||
|
|
||||||
FROM alpine:3.13.1
|
FROM alpine:3.13.5
|
||||||
|
|
||||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||||
ENV TZ Europe/Moscow
|
ENV TZ Europe/Moscow
|
||||||
|
Reference in New Issue
Block a user