Commit 1a1f401 1 parent 5556148 commit 1a1f401 Copy full SHA for 1a1f401
File tree 4 files changed +8
-8
lines changed
docker-maven-plugin/src/main/java/org/openmrs/maven/plugins
sdk-commons/src/main/java/org/openmrs/maven/plugins/utility
4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 21
21
22
22
abstract class AbstractDockerMojo extends AbstractMojo {
23
23
24
- protected static final String DEFAULT_MYSQL_CONTAINER = "openmrs-sdk-mysql-v3-2 " ;
24
+ protected static final String DEFAULT_MYSQL_CONTAINER = "openmrs-sdk-mysql-v3-3 " ;
25
25
protected static final String DEFAULT_MYSQL_EXPOSED_PORT = "3308" ;
26
26
protected static final String DEFAULT_MYSQL_PASSWORD = "Admin123" ;
27
- protected static final String MYSQL_5_6 = "mysql:5.6 " ;
27
+ protected static final String MYSQL_8_4_1 = "mysql:8.4.1 " ;
28
28
protected static final String DEFAULT_MYSQL_DB_URI = "jdbc:mysql://localhost:" + DEFAULT_MYSQL_EXPOSED_PORT + "/" ;
29
29
private static final Logger logger = LoggerFactory .getLogger (AbstractDockerMojo .class );
30
30
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ public void executeTask() throws MojoExecutionException {
62
62
}
63
63
64
64
private boolean noMySqlImage (DockerClient docker ) {
65
- List <Image > mysql = docker .listImagesCmd ().withImageNameFilter (MYSQL_5_6 ).exec ();
65
+ List <Image > mysql = docker .listImagesCmd ().withImageNameFilter (MYSQL_8_4_1 ).exec ();
66
66
return mysql .size () == 0 ;
67
67
}
68
68
@@ -81,7 +81,7 @@ private void createMysqlContainer(DockerClient docker) {
81
81
.withPortBindings (portBinding )
82
82
.withBinds (boundVolume );
83
83
84
- docker .createContainerCmd (MYSQL_5_6 )
84
+ docker .createContainerCmd (MYSQL_8_4_1 )
85
85
.withHostConfig (hostConfig )
86
86
.withName (container )
87
87
.withEnv ("MYSQL_ROOT_PASSWORD=" +rootPassword )
@@ -93,11 +93,11 @@ private void createMysqlContainer(DockerClient docker) {
93
93
private void pullMySqlImage (DockerClient docker ) throws MojoExecutionException {
94
94
final CountDownLatch latch = new CountDownLatch (1 );
95
95
docker .pullImageCmd ("mysql" )
96
- .withTag ("5.6 " )
96
+ .withTag ("8.4.1 " )
97
97
.exec (new ResultCallback <PullResponseItem >() {
98
98
@ Override
99
99
public void onStart (Closeable closeable ) {
100
- showMessage ("Started downloading mysql:5.6 image ..." );
100
+ showMessage ("Started downloading mysql:8.4.1 image ..." );
101
101
}
102
102
103
103
@ Override
Original file line number Diff line number Diff line change @@ -118,7 +118,7 @@ public class DefaultWizard implements Wizard {
118
118
119
119
public static final String DB_OPTION_MYSQL = "MySQL 5.6 and above (requires pre-installed MySQL 5.6 and above)" ;
120
120
121
- public static final String DB_OPTION_SDK_DOCKER_MYSQL = "MySQL 5.6 and above in SDK docker container (requires pre-installed Docker)" ;
121
+ public static final String DB_OPTION_SDK_DOCKER_MYSQL = "MySQL 8.4.1 and above in SDK docker container (requires pre-installed Docker)" ;
122
122
123
123
public static final String DB_OPTION_DOCKER_MYSQL = "Existing docker container (requires pre-installed Docker)" ;
124
124
Original file line number Diff line number Diff line change 26
26
27
27
public class DockerHelper {
28
28
29
- public static final String DOCKER_DEFAULT_CONTAINER_ID = "openmrs-sdk-mysql-v3-2 " ;
29
+ public static final String DOCKER_DEFAULT_CONTAINER_ID = "openmrs-sdk-mysql-v3-3 " ;
30
30
public static final String DOCKER_MYSQL_PORT = "3308" ;
31
31
public static final String DOCKER_MYSQL_USERNAME = "root" ;
32
32
public static final String DOCKER_MYSQL_PASSWORD = "Admin123" ;
You can’t perform that action at this time.
0 commit comments