Revert "fix build dirs"

This reverts commit 1075790c45.
bump squid to 5.6
2025-10-08 23:39:17 +00:00 · 2022-06-16 10:37:35 +03:00 · 2022-06-16 10:37:35 +03:00 · 2022-06-02 12:41:41 +03:00 · 2022-06-02 12:41:41 +03:00 · 2022-06-01 15:03:32 +03:00
2 changed files with 19 additions and 23 deletions
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -22,20 +22,20 @@ jobs:
      - uses: actions/checkout@v3

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2

      - name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          username: b4tman
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Cache Docker layers
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -43,7 +43,7 @@ jobs:
            ${{ runner.os }}-buildx-

      - name: Build squid image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: .
          push: false
@@ -64,7 +64,7 @@ jobs:
        run: docker-compose -f docker-compose.test.yml up sut

      - name: Build 'ssl-bump' image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: ssl-bump
          push: false
@@ -131,13 +131,13 @@ jobs:
            type=semver,pattern={{major}}.{{minor}}

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2

      - name: Cache Docker layers
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.3
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -145,20 +145,20 @@ jobs:
            ${{ runner.os }}-buildx-

      - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          username: b4tman
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.CR_PAT }}

      - name: Build squid image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: .
          push: true
@@ -177,7 +177,7 @@ jobs:
          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

      - name: Build 'ssl-bump' image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: ssl-bump
          push: true
@@ -197,7 +197,7 @@ jobs:
          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

      - name: Build 'ssl-bump' image for ghcr
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: ssl-bump
          push: true
--- a/14
+++ b/14
@@ -1,6 +1,6 @@
-FROM alpine:3.15.4 as build
+FROM alpine:3.16.0 as build

-ENV SQUID_VER 5.5
+ENV SQUID_VER 5.6

 RUN set -x && \
 	apk add --no-cache  \
@@ -91,10 +91,6 @@ RUN set -x && \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid

-# fix build
-RUN set -x && \
-    mkdir -p /tmp/build/tools/squidclient/tests && \
-    mkdir -p /tmp/build/tools/tests

 RUN set -x && \
 	cd /tmp/build && \
@@ -106,7 +102,7 @@ RUN set -x && \
 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

-FROM alpine:3.15.4
+FROM alpine:3.16.0
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -119,8 +115,8 @@ RUN apk add --no-cache \
 		libstdc++ \
 		heimdal-libs \
 		libcap \
-		libressl3.4-libcrypto \
-		libressl3.4-libssl \
+		libressl3.5-libcrypto \
+		libressl3.5-libssl \
 		libltdl	

 COPY --from=build /etc/squid/ /etc/squid/
Author	SHA1	Message	Date
Dmitry	12bcc8b563	Revert "fix build dirs" This reverts commit `1075790c45`.	2022-06-16 10:37:35 +03:00
Dmitry	551440b10b	bump squid to 5.6	2022-06-16 10:37:35 +03:00
Dmitry	363e8fc3b3	bump libressl to 3.5	2022-06-02 12:41:41 +03:00
dependabot[bot]	70328d9317	Bump alpine from 3.15.4 to 3.16.0 Bumps alpine from 3.15.4 to 3.16.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-02 12:41:41 +03:00
dependabot[bot]	4f4a317dd1	Bump docker/build-push-action from 2 to 3 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 15:03:32 +03:00
dependabot[bot]	1a73d68725	Bump docker/setup-buildx-action from 1 to 2 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 15:03:19 +03:00
dependabot[bot]	3c252eeefc	Bump docker/login-action from 1 to 2 Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 15:02:47 +03:00
dependabot[bot]	adaca5c8f6	Bump docker/setup-qemu-action from 1 to 2 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 14:55:20 +03:00
dependabot[bot]	7c96578aba	Bump actions/cache from 3.0.2 to 3.0.3 Bumps [actions/cache](https://github.com/actions/cache) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.2...v3.0.3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 14:06:05 +03:00