diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d2628a4..06c382f 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -66,26 +66,10 @@ jobs: - name: Test image run: docker compose -f docker-compose.test.yml up --pull never sut - - name: set base image for ssl-bump - run: sed -i "s%FROM b4tman/squid%FROM $TEST_TAG%" ssl-bump/Dockerfile - - - name: Build 'ssl-bump' image - uses: docker/build-push-action@v4 - with: - context: ssl-bump - push: false - file: ssl-bump/Dockerfile - tags: b4tman/squid:ssl-bump - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - # Temp fix - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: Move cache + - name: Build 'ssl-bump' image run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache + sed -i "s%FROM b4tman/squid%FROM $TEST_TAG%" ssl-bump/Dockerfile + docker build ssl-bump push: needs: test