From 72f080f7950bc6feacf2c452a6b667b87ec3b746 Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Fri, 2 Sep 2022 14:57:57 -0700 Subject: [PATCH] Caches builds for e2e (#1863) * Caches builds for e2e * Adds docker login * Removes typo --- .github/workflows/deploy.yml | 2 -- .github/workflows/dev.yml | 2 -- .github/workflows/test.yml | 11 ++++++++--- e2e/docker-compose.yml | 9 +++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 44714395..35ac4cfa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,8 +52,6 @@ jobs: uses: docker/metadata-action@v4 with: images: amir20/dozzle - - name: Set up QEMU - uses: docker/setup-qemu-action@v2.0.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2.0.0 - name: Login to DockerHub diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 72e0f905..de556535 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -17,8 +17,6 @@ jobs: uses: docker/metadata-action@v4 with: images: amir20/dozzle - - name: Set up QEMU - uses: docker/setup-qemu-action@v2.0.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2.0.0 - name: Login to DockerHub diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39e3b620..5d1c1c45 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,12 +43,17 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v2.0.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2.0.0 + - name: Login to DockerHub + uses: docker/login-action@v2.0.0 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build images - run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose -f e2e/docker-compose.yml build + run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose -f e2e/docker-compose.yml build --build-arg BUILDKIT_INLINE_CACHE=1 + - name: Push images + run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose -f e2e/docker-compose.yml push - name: Set commit message for push if: github.event_name == 'push' run: | diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml index 41d05d8d..76f5ca13 100644 --- a/e2e/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -10,8 +10,11 @@ services: - DOZZLE_NO_ANALYTICS=1 ports: - "8080:8080" + image: amir20/dozzle_custom_cache build: context: .. + cache_from: + - amir20/dozzle_custom_cache:latest dozzle: container_name: dozzle volumes: @@ -21,11 +24,17 @@ services: - DOZZLE_NO_ANALYTICS=1 ports: - "9090:8080" + image: amir20/dozzle_cache:latest build: context: .. + cache_from: + - amir20/dozzle_cache:latest cypress: build: context: . + cache_from: + - amir20/dozzle_cypress_cache:latest + image: amir20/dozzle_cypress_cache:latest working_dir: /e2e volumes: - ./cypress:/e2e/cypress