Skip to content

Commit

Permalink
Merge pull request #9927 from Sanne/UpgradeSQLServer
Browse files Browse the repository at this point in the history
Update image of mssql-server-linux used for integration testing
  • Loading branch information
gsmet authored Jun 11, 2020
2 parents a1d1e97 + 00ce695 commit 8119850
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
ports:
- 127.0.0.1:3308:3306
mssql:
image: microsoft/mssql-server-linux:2017-CU12
image: microsoft/mssql-server-linux:2017-CU13
env:
ACCEPT_EULA: Y
SA_PASSWORD: ActuallyRequired11Complexity
Expand Down Expand Up @@ -506,7 +506,7 @@ jobs:
run: |
docker run --rm --publish 1433:1433 --name build-mssql \
-e ACCEPT_EULA=Y -e SA_PASSWORD=ActuallyRequired11Complexity \
-d microsoft/mssql-server-linux:2017-CU12
-d microsoft/mssql-server-linux:2017-CU13
if: matrix.mssql
- name: Amazon Services
run: |
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jpa-mssql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<properties>
<mssqldb.url>jdbc:sqlserver://localhost:1433;databaseName=tempdb</mssqldb.url>
<mssqldb.sa-password>ActuallyRequired11Complexity</mssqldb.sa-password>
<mssqldb.image>microsoft/mssql-server-linux:2017-CU12</mssqldb.image>
<mssqldb.image>microsoft/mssql-server-linux:2017-CU13</mssqldb.image>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
/**
* Test connecting Hibernate ORM to MS SQL.
* Can quickly start a matching database with:
* sudo docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 -e 'ACCEPT_EULA=Y' -e
* 'SA_PASSWORD=ActuallyRequired11Complexity' -p 1433:1433 --name quarkus_test_mssql -d microsoft/mssql-server-linux:2017-CU12
* sudo docker run --ulimit memlock=-1:-1 -it --rm=true --net=host --memory-swappiness=0 -e 'ACCEPT_EULA=Y' -e
* 'SA_PASSWORD=ActuallyRequired11Complexity' -p 1433:1433 --name quarkus_test_mssql -d microsoft/mssql-server-linux:2017-CU13
*/
@QuarkusTest
public class JPAFunctionalityTest {
Expand Down

0 comments on commit 8119850

Please sign in to comment.