Skip to content

Commit d5b0980

Browse files
stasadevrfay
andauthored
Use redis:6-bullseye to support old systems, update GitHub test workflow (#17)
Co-authored-by: Randy Fay <[email protected]>
1 parent 5bcb6fd commit d5b0980

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ permissions:
2424

2525
env:
2626
NIGHTLY_DDEV_PR_URL: "https://nightly.link/ddev/ddev/actions/runs/1720215802/ddev-linux-amd64.zip"
27-
# Allow ddev get to use a github token to prevent rate limiting by tests
27+
# Allow ddev get to use a GitHub token to prevent rate limiting by tests
2828
DDEV_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29-
# Allow `--HEAD` flag when running tests against HEAD
30-
HOMEBREW_NO_INSTALL_FROM_API: 1
29+
# Pull the same image as in docker-compose.redis.yaml
30+
REDIS_IMAGE: redis:6-bullseye
3131
jobs:
3232
tests:
3333
defaults:
@@ -40,10 +40,10 @@ jobs:
4040
# ddev_version: [PR]
4141
fail-fast: false
4242

43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4444

4545
steps:
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v3
4747
- name: Set up Homebrew
4848
id: set-up-homebrew
4949
uses: Homebrew/actions/setup-homebrew@master
@@ -74,7 +74,7 @@ jobs:
7474
- name: Download docker images
7575
run: |
7676
mkdir junk && pushd junk && ddev config --auto && ddev debug download-images >/dev/null
77-
docker pull redis:6 >/dev/null
77+
docker pull ${REDIS_IMAGE} >/dev/null
7878
- name: tmate debugging session
7979
uses: mxschmitt/action-tmate@v3
8080
with:

docker-compose.redis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33
redis:
44
container_name: ddev-${DDEV_SITENAME}-redis
5-
image: redis:6
5+
image: redis:6-bullseye
66
# These labels ensure this service is discoverable by ddev.
77
labels:
88
com.ddev.site-name: ${DDEV_SITENAME}

0 commit comments

Comments
 (0)