Skip to content

Commit 1a1f401

Browse files
committed
Update the MySQL version to 8.4.1
1 parent 5556148 commit 1a1f401

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

docker-maven-plugin/src/main/java/org/openmrs/maven/plugins/AbstractDockerMojo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
abstract class AbstractDockerMojo extends AbstractMojo {
2323

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";
2525
protected static final String DEFAULT_MYSQL_EXPOSED_PORT = "3308";
2626
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";
2828
protected static final String DEFAULT_MYSQL_DB_URI = "jdbc:mysql://localhost:" + DEFAULT_MYSQL_EXPOSED_PORT + "/";
2929
private static final Logger logger = LoggerFactory.getLogger(AbstractDockerMojo.class);
3030

docker-maven-plugin/src/main/java/org/openmrs/maven/plugins/CreateMySql.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void executeTask() throws MojoExecutionException {
6262
}
6363

6464
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();
6666
return mysql.size() == 0;
6767
}
6868

@@ -81,7 +81,7 @@ private void createMysqlContainer(DockerClient docker) {
8181
.withPortBindings(portBinding)
8282
.withBinds(boundVolume);
8383

84-
docker.createContainerCmd(MYSQL_5_6)
84+
docker.createContainerCmd(MYSQL_8_4_1)
8585
.withHostConfig(hostConfig)
8686
.withName(container)
8787
.withEnv("MYSQL_ROOT_PASSWORD="+rootPassword)
@@ -93,11 +93,11 @@ private void createMysqlContainer(DockerClient docker) {
9393
private void pullMySqlImage(DockerClient docker) throws MojoExecutionException {
9494
final CountDownLatch latch = new CountDownLatch(1);
9595
docker.pullImageCmd("mysql")
96-
.withTag("5.6")
96+
.withTag("8.4.1")
9797
.exec(new ResultCallback<PullResponseItem>() {
9898
@Override
9999
public void onStart(Closeable closeable) {
100-
showMessage("Started downloading mysql:5.6 image ...");
100+
showMessage("Started downloading mysql:8.4.1 image ...");
101101
}
102102

103103
@Override

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/DefaultWizard.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public class DefaultWizard implements Wizard {
118118

119119
public static final String DB_OPTION_MYSQL = "MySQL 5.6 and above (requires pre-installed MySQL 5.6 and above)";
120120

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)";
122122

123123
public static final String DB_OPTION_DOCKER_MYSQL = "Existing docker container (requires pre-installed Docker)";
124124

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/DockerHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class DockerHelper {
2828

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";
3030
public static final String DOCKER_MYSQL_PORT = "3308";
3131
public static final String DOCKER_MYSQL_USERNAME = "root";
3232
public static final String DOCKER_MYSQL_PASSWORD = "Admin123";

0 commit comments

Comments
 (0)