From d5b0980871b46d4432e6c560bc6cb9fc7b804361 Mon Sep 17 00:00:00 2001 From: Stanislav Zhuk Date: Wed, 2 Aug 2023 11:12:55 +0300 Subject: [PATCH] Use redis:6-bullseye to support old systems, update GitHub test workflow (#17) Co-authored-by: Randy Fay --- .github/workflows/tests.yml | 12 ++++++------ docker-compose.redis.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 39d3af5..5eba11c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,10 +24,10 @@ permissions: env: NIGHTLY_DDEV_PR_URL: "https://nightly.link/ddev/ddev/actions/runs/1720215802/ddev-linux-amd64.zip" - # Allow ddev get to use a github token to prevent rate limiting by tests + # Allow ddev get to use a GitHub token to prevent rate limiting by tests DDEV_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Allow `--HEAD` flag when running tests against HEAD - HOMEBREW_NO_INSTALL_FROM_API: 1 + # Pull the same image as in docker-compose.redis.yaml + REDIS_IMAGE: redis:6-bullseye jobs: tests: defaults: @@ -40,10 +40,10 @@ jobs: # ddev_version: [PR] fail-fast: false - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master @@ -74,7 +74,7 @@ jobs: - name: Download docker images run: | mkdir junk && pushd junk && ddev config --auto && ddev debug download-images >/dev/null - docker pull redis:6 >/dev/null + docker pull ${REDIS_IMAGE} >/dev/null - name: tmate debugging session uses: mxschmitt/action-tmate@v3 with: diff --git a/docker-compose.redis.yaml b/docker-compose.redis.yaml index 95c85cb..b5828e3 100644 --- a/docker-compose.redis.yaml +++ b/docker-compose.redis.yaml @@ -2,7 +2,7 @@ services: redis: container_name: ddev-${DDEV_SITENAME}-redis - image: redis:6 + image: redis:6-bullseye # These labels ensure this service is discoverable by ddev. labels: com.ddev.site-name: ${DDEV_SITENAME}