build: Switch docker image for MS Sql Server and re-enable CI job

akka · Sep 27, 2024 · 48c4a41 · 48c4a41
1 parent 5aba181
commit 48c4a41
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,11 +31,12 @@ jobs:
  test: '"integration/testOnly akka.persistence.jdbc.integration.Postgres*"'
  script: 'launch-postgres.sh'
  hasOldDao: true
-# FIXME disabled because of broken docker image, https://github.com/akka/akka-persistence-jdbc/issues/860
-# - name: "SqlServer"
-# test: '"integration/testOnly akka.persistence.jdbc.integration.SqlServer*"'
-# script: 'launch-sqlserver.sh'
-# hasOldDao: true
+
+ - name: "SqlServer"
+ test: '"integration/testOnly akka.persistence.jdbc.integration.SqlServer*"'
+ script: 'launch-sqlserver.sh'
+ hasOldDao: true
+
  name: Integration Test ${{ matrix.db.name }}
 
  steps:

diff --git a/core/src/test/resources/sqlserver-application.conf b/core/src/test/resources/sqlserver-application.conf
@@ -56,8 +56,8 @@ slick {
  host = ${docker.host}
  host = ${?DB_HOST}
  url = "jdbc:sqlserver://"${slick.db.host}":1433;databaseName=docker;integratedSecurity=false"
- user = "docker"
- password = "docker"
+ user = "sa"
+ password = "docker123abc#"
  driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
  numThreads = 5
  maxConnections = 5

diff --git a/core/src/test/resources/sqlserver-shared-db-application.conf b/core/src/test/resources/sqlserver-shared-db-application.conf
@@ -26,8 +26,8 @@ akka-persistence-jdbc {
  host = ${docker.host}
  host = ${?DB_HOST}
  url = "jdbc:sqlserver://"${akka-persistence-jdbc.shared-databases.slick.db.host}":1433;databaseName=docker;integratedSecurity=false;"
- user = "docker"
- password = "docker"
+ user = "sa"
+ password = "docker123abc#"
  driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
  numThreads = 5
  maxConnections = 5

diff --git a/migrator/src/test/resources/sqlserver-application.conf b/migrator/src/test/resources/sqlserver-application.conf
@@ -55,8 +55,8 @@ slick {
  host = ${docker.host}
  host = ${?DB_HOST}
  url = "jdbc:sqlserver://"${slick.db.host}":1433;databaseName=docker;integratedSecurity=false"
- user = "docker"
- password = "docker"
+ user = "sa"
+ password = "docker123abc#"
  driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
  numThreads = 5
  maxConnections = 5

diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
@@ -29,14 +29,11 @@ services:
  - "1521:1521" # DB_CONN: credentials (system:oracle)
 
  sqlserver:
- image: topaztechnology/mssql-server-linux
+ image: mcr.microsoft.com/mssql/server:2019-latest
  container_name: sqlserver-test
  environment:
  - "TZ=Europe/Amsterdam"
- - "DBCA_TOTAL_MEMORY=1024"
  - "ACCEPT_EULA=Y"
- - "SQL_USER=docker"
- - "SQL_PASSWORD=docker"
- - "SQL_DB=docker"
+ - "MSSQL_SA_PASSWORD=docker123abc#"
  ports:
- - "1433:1433" # credentials (docker:docker)
+ - "1433:1433" # credentials (sa:docker123abc#)
diff --git a/scripts/launch-sqlserver.sh b/scripts/launch-sqlserver.sh
@@ -24,3 +24,4 @@ docker compose -f scripts/docker-compose.yml kill sqlserver
 docker compose -f scripts/docker-compose.yml rm -f sqlserver
 docker compose -f scripts/docker-compose.yml up -d sqlserver
 wait 1433 SqlServer
+docker exec -it sqlserver-test /opt/mssql-tools18/bin/sqlcmd -N o -S localhost -U sa -P docker123abc# -Q "create database docker"
diff --git a/scripts/sqlserver-cli.sh b/scripts/sqlserver-cli.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 echo "================== Help for SqlServer cli ========================"
 echo "================================================================="
-docker exec -it sqlserver-test /opt/mssql-tools/bin/sqlcmd -S localhost -U docker -P docker -d docker
+
+docker exec -it sqlserver-test /opt/mssql-tools18/bin/sqlcmd -N o -S localhost -U sa -P docker123abc# -d docker