From 42f2bf52aba2b5a14d2fa0c756d7c89385a7f821 Mon Sep 17 00:00:00 2001 From: Roberto Peruzzo Date: Thu, 26 Sep 2024 13:31:16 +0200 Subject: [PATCH 1/2] fix: downgrades the action runner image to ubuntu:20.04, the same of sqlsrv one. --- .github/workflows/tests.yml | 2 +- docker-compose.sqlsrv.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c932d05..73451c5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: ddev_version: [stable, HEAD] fail-fast: false - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: ddev/github-action-add-on-test@v2 diff --git a/docker-compose.sqlsrv.yaml b/docker-compose.sqlsrv.yaml index 8d6f119..d5eb087 100644 --- a/docker-compose.sqlsrv.yaml +++ b/docker-compose.sqlsrv.yaml @@ -5,7 +5,9 @@ services: hostname: ddev-${DDEV_SITENAME}-sqlsrv # For possible options: https://hub.docker.com/_/microsoft-mssql-server. - # This does not yet work with Apple M1. See: https://github.com/microsoft/mssql-docker/issues/734 + # This does not yet work with Apple M1. For more details: + # - https://github.com/microsoft/mssql-docker/issues/734 + # - https://github.com/microsoft/mssql-docker/issues/802 image: mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04 user: root From 638183e4052b007970366b6d7110fd447085abde Mon Sep 17 00:00:00 2001 From: Roberto Peruzzo Date: Thu, 26 Sep 2024 14:23:40 +0200 Subject: [PATCH 2/2] fix: improves the comments. --- .github/workflows/tests.yml | 4 ++++ docker-compose.sqlsrv.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 73451c5..a3425cf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,6 +34,10 @@ jobs: ddev_version: [stable, HEAD] fail-fast: false + # We need to use the ubuntu-20.04 image because the sqlsrv service uses the + # mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04 image. + # See the issue https://github.com/ddev/ddev-sqlsrv/issues/29 for more + # details. runs-on: ubuntu-20.04 steps: diff --git a/docker-compose.sqlsrv.yaml b/docker-compose.sqlsrv.yaml index d5eb087..6f04ff7 100644 --- a/docker-compose.sqlsrv.yaml +++ b/docker-compose.sqlsrv.yaml @@ -4,8 +4,8 @@ services: container_name: ddev-${DDEV_SITENAME}-sqlsrv hostname: ddev-${DDEV_SITENAME}-sqlsrv - # For possible options: https://hub.docker.com/_/microsoft-mssql-server. - # This does not yet work with Apple M1. For more details: + # For available options look at https://hub.docker.com/_/microsoft-mssql-server. + # This image that does not work with Apple M1 yet. For more details: # - https://github.com/microsoft/mssql-docker/issues/734 # - https://github.com/microsoft/mssql-docker/issues/802 image: mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04