Update mssql image version

opengisch · Oct 11, 2024 · 732d420 · 732d420
1 parent 3ad721e
commit 732d420
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.docker/docker-compose.gh.yml b/.docker/docker-compose.gh.yml
@@ -19,7 +19,7 @@ services:
       - "POSTGRES_HOST_AUTH_METHOD=md5"
 
   mssql:
-    image: mcr.microsoft.com/mssql/server:2019-CU11-ubuntu-20.04
+    image: mcr.microsoft.com/mssql/server:2019-CU28-ubuntu-20.04
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: <YourStrong!Passw0rd>

diff --git a/tests/README.md b/tests/README.md
@@ -27,22 +27,24 @@ Run all test starting with ``test_array_`
 These are dirty notes for the quickest way to test mssql queries manually in the way the tests work.
 
 1. Create a new dir. E.g. `.local_docker_test`
-2. Copy the original docker-compose file from directory `.docker` and remove everything except the qgis and the mssql container.
-3. Copy the original Dockerfile as well. Leave it like it is...
+2. Copy the original docker-compose file from directory `.docker` and remove everything except the qgis and the mssql container (remove the postgis dependency in qgis as well).
 4. Copy the original `run-docker-tests.sh` and remove everything except:
     ```bash
     set -e
 
     /usr/src/tests/testdata/mssql/setup-mssql.sh
     ```
 5. Do the following:
+    Go to the local folder
     ```bash
-    docker-compose up -d
-    docker exec -it local_docker_tests_qgis_1 bash
+    export QGIS_TEST_VERSION=latest
+    export GITHUB_WORKSPACE=$PWD
+    docker-compose -f .local_docker_test/docker-compose.gh.yml up -d
+    docker exec -it local_docker_test_qgis_1 bash
     ```
     And then in the qgis docker:
     ```bash
-    /usr/src/.local_docker_tests/run-docker-tests.sh;
+    /usr/src/.local_docker_test/run-docker-tests.sh
     java -jar /usr/src/modelbaker/iliwrapper/bin/ili2mssql-5.0.0/ili2mssql-5.0.0.jar --schemaimport --dbhost mssql --dbusr sa --dbpwd '<YourStrong!Passw0rd>' --dbdatabase gis --dbschema optimal_polymorph_manuel --coalesceCatalogueRef --createEnumTabs --createNumChecks --createUnique --createFk --createFkIdx --coalesceMultiSurface --coalesceMultiLine --coalesceMultiPoint --coalesceArray --beautifyEnumDispName --createGeomIdx --createMetaInfo --expandMultilingual --createTypeConstraint --createEnumTabsWithId --createTidCol --importTid --smart2Inheritance --strokeArcs --createBasketCol --defaultSrsAuth EPSG --defaultSrsCode 2056 --preScript NULL --postScript NULL --models Polymorphic_Ortsplanung_V1_1 --iliMetaAttrs NULL /usr/src/tests/testdata/ilimodels/Polymorphic_Ortsplanung_V1_1.ili
     ```
     (Surely this could be done without this qgis container, but there you have everything for the set up already...)