diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java index 04a8b6837ea987c530b02ffc2b7d67876032f64a..0513dfb668383dae9112f409ce425827265735cc 100644 --- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java +++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java @@ -4,7 +4,6 @@ import at.tuwien.api.container.image.ImageBriefDto; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.persistence.Column; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java index 251346ac9fc475aa1b5c8f869e185ed57ad992ef..a83b425e34783b390002ec7bd30832d4fd894d53 100644 --- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java +++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java @@ -51,7 +51,7 @@ public class Container { @Column(nullable = false, columnDefinition = "integer default port") private Integer uiPort; - @Column(name = "ui_additional_flags") + @Column private String uiAdditionalFlags; @ToString.Exclude diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java index 615d13d2493cdd9a51521b7549f147e09e6ef012..e03d93e3322f7f91965b353db20ab68cc9e6a809 100644 --- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java +++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java @@ -825,6 +825,9 @@ public abstract class BaseTest { public final static String CONTAINER_1_NAME = "u01"; public final static String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01"; public final static String CONTAINER_1_IP = "127.0.0.1"; + public final static String CONTAINER_1_UI_HOST = "localhost"; + public final static Integer CONTAINER_1_UI_PORT = 3306; + public final static String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable"; public final static Boolean CONTAINER_1_RUNNING = true; public final static Integer CONTAINER_1_PORT = 3308; public final static String CONTAINER_1_PRIVILEGED_USERNAME = "root"; @@ -840,6 +843,9 @@ public abstract class BaseTest { .created(CONTAINER_1_CREATED) .host(CONTAINER_1_IP) .port(CONTAINER_1_PORT) + .uiHost(CONTAINER_1_UI_HOST) + .uiPort(CONTAINER_1_UI_PORT) + .uiAdditionalFlags(CONTAINER_1_UI_ADDITIONAL_FLAGS) .privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME) .privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD) .build();