Skip to content

update MS SQL Server image hub #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiview merged 1 commit into from
Nov 26, 2018
Merged

update MS SQL Server image hub #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/jdbc-test/src/test/resources/container-license-acceptance.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
microsoft/mssql-server-linux:2017-CU6
mcr.microsoft.com/mssql/server:2017-CU12
2 changes: 1 addition & 1 deletion modules/mssqlserver/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class SomeTest {
... create a connection and run test as normal
```

> *Note:* Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, Please place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `microsoft/mssql-server-linux:latest`
> *Note:* Due to licencing restrictions you are required to accept an EULA for this container image. To indicate that you accept the MS SQL Server image EULA, Please place a file at the root of the classpath named `container-license-acceptance.txt`, e.g. at `src/test/resources/container-license-acceptance.txt`. This file should contain the line: `mcr.microsoft.com/mssql/server:latest`

## Dependency information

Expand Down
4 changes: 2 additions & 2 deletions modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/
public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
public static final String NAME = "mssqlserver";
public static final String IMAGE = "microsoft/mssql-server-linux";
public static final String DEFAULT_TAG = "2017-CU6";
public static final String IMAGE = "mcr.microsoft.com/mssql/server";
public static final String DEFAULT_TAG = "2017-CU12";

public static final Integer MS_SQL_SERVER_PORT = 1433;
private String username = "SA";
Expand Down