1
0
mirror of https://github.com/b4tman/docker-squid.git synced 2024-10-23 14:25:06 +00:00

Compare commits

..

No commits in common. "0f8b8450c4f5a8b6e85401e509512d7f9dd7e8cd" and "b209dc2c5beee16d00b8051804768c4cd07b2d04" have entirely different histories.

2 changed files with 9 additions and 9 deletions

View File

@ -26,14 +26,14 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v2
- name: Login to DockerHub - name: Login to DockerHub
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v3 uses: docker/login-action@v2
with: with:
username: b4tman username: b4tman
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
@ -122,10 +122,10 @@ jobs:
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v2
- name: Cache Docker layers - name: Cache Docker layers
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.2
@ -136,13 +136,13 @@ jobs:
${{ runner.os }}-buildx- ${{ runner.os }}-buildx-
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v3 uses: docker/login-action@v2
with: with:
username: b4tman username: b4tman
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GHCR - name: Login to GHCR
uses: docker/login-action@v3 uses: docker/login-action@v2
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}

View File

@ -1,4 +1,4 @@
FROM alpine:3.18.4 as build FROM alpine:3.18.3 as build
ARG SQUID_VER=6.3 ARG SQUID_VER=6.3
@ -106,7 +106,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
# --- --- --- --- --- --- --- --- --- # --- --- --- --- --- --- --- --- ---
FROM alpine:3.18.4 FROM alpine:3.18.3
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow ENV TZ Europe/Moscow