[Images] Small refactors

tnb-software · Nov 3, 2023 · 20fe6a1 · 20fe6a1
1 parent 46c557e
commit 20fe6a1
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 25 deletions.
diff --git a/system-x/services/aws/common/src/main/java/software/tnb/aws/common/service/LocalStack.java b/system-x/services/aws/common/src/main/java/software/tnb/aws/common/service/LocalStack.java
@@ -16,6 +16,6 @@ public abstract class LocalStack extends Service<AWSAccount, SdkClient, Validati
 
     @Override
     public String defaultImage() {
-        return "quay.io/fuse_qe/localstack:1.4.0";
+        return "quay.io/fuse_qe/localstack:2.3";
     }
 }
diff --git a/system-x/services/fhir/src/main/java/software/tnb/fhir/resource/local/LocalFhir.java b/system-x/services/fhir/src/main/java/software/tnb/fhir/resource/local/LocalFhir.java
@@ -13,11 +13,6 @@ public class LocalFhir extends Fhir implements Deployable {
     private static final Logger LOG = LoggerFactory.getLogger(LocalFhir.class);
     private FhirContainer container;
 
-    @Override
-    public String defaultImage() {
-        return FHIR_IMAGE;
-    }
-
     @Override
     public void deploy() {
         LOG.info("Starting FHIR container");

diff --git a/system-x/services/fhir/src/main/java/software/tnb/fhir/resource/openshift/OpenshiftFhir.java b/system-x/services/fhir/src/main/java/software/tnb/fhir/resource/openshift/OpenshiftFhir.java
@@ -22,11 +22,6 @@
 @AutoService(Fhir.class)
 public class OpenshiftFhir extends Fhir implements ReusableOpenshiftDeployable, WithName, WithInClusterHostname {
 
-    @Override
-    public String defaultImage() {
-        return FHIR_IMAGE;
-    }
-
     @Override
     public void undeploy() {
         OpenshiftClient.get().deploymentConfigs().withName(name()).delete();

diff --git a/system-x/services/fhir/src/main/java/software/tnb/fhir/service/Fhir.java b/system-x/services/fhir/src/main/java/software/tnb/fhir/service/Fhir.java
@@ -9,7 +9,6 @@
 import java.util.Map;
 
 public abstract class Fhir extends Service<NoAccount, NoClient, NoValidation> implements WithDockerImage {
-    public static final String FHIR_IMAGE = "quay.io/fuse_qe/hapi:v4.2.0";
     public static final int PORT = 8080;
 
     public abstract int getPortMapping();
@@ -21,4 +20,9 @@ public Map<String, String> containerEnvironment() {
             "HAPI_FHIR_VERSION", "DSTU3",
             "HAPI_REUSE_CACHED_SEARCH_RESULTS_MILLIS", "-1");
     }
+
+    @Override
+    public String defaultImage() {
+        return "quay.io/fuse_qe/hapi:v4.2.0";
+    }
 }
diff --git a/.../rabbitmq/src/main/java/software/tnb/jms/rabbitmq/resource/local/LocalRabbitMQBroker.java b/.../rabbitmq/src/main/java/software/tnb/jms/rabbitmq/resource/local/LocalRabbitMQBroker.java
@@ -17,11 +17,6 @@ public class LocalRabbitMQBroker extends RabbitMQ implements Deployable, WithDoc
     private static final Logger LOG = LoggerFactory.getLogger(RabbitMQ.class);
     private RabbitMQBrokerContainer container;
 
-    @Override
-    public String defaultImage() {
-        return IMAGE;
-    }
-
     @Override
     public void deploy() {
         LOG.info("Starting RabbitMQ container");

diff --git a/...q/src/main/java/software/tnb/jms/rabbitmq/resource/openshift/OpenshiftRabbitMQBroker.java b/...q/src/main/java/software/tnb/jms/rabbitmq/resource/openshift/OpenshiftRabbitMQBroker.java
@@ -23,11 +23,6 @@
 @AutoService(RabbitMQ.class)
 public class OpenshiftRabbitMQBroker extends RabbitMQ implements ReusableOpenshiftDeployable, WithName, WithInClusterHostname, WithDockerImage {
 
-    @Override
-    public String defaultImage() {
-        return IMAGE;
-    }
-
     @Override
     public void undeploy() {
         OpenshiftClient.get().deploymentConfigs().withName(name()).delete();

diff --git a/system-x/services/jms/rabbitmq/src/main/java/software/tnb/jms/rabbitmq/service/RabbitMQ.java b/system-x/services/jms/rabbitmq/src/main/java/software/tnb/jms/rabbitmq/service/RabbitMQ.java
@@ -1,5 +1,6 @@
 package software.tnb.jms.rabbitmq.service;
 
+import software.tnb.common.deployment.WithDockerImage;
 import software.tnb.common.service.Service;
 import software.tnb.jms.rabbitmq.account.RabbitmqAccount;
 import software.tnb.jms.rabbitmq.validation.RabbitMQValidation;
@@ -9,10 +10,9 @@
 
 import jakarta.jms.Connection;
 
-public abstract class RabbitMQ extends Service<RabbitmqAccount, Connection, RabbitMQValidation> {
+public abstract class RabbitMQ extends Service<RabbitmqAccount, Connection, RabbitMQValidation> implements WithDockerImage {
     public static final int PORT = 5672;
     public static final int MANAGEMENT_PORT = 15672;
-    public static final String IMAGE = "quay.io/rh_integration/rabbitmq:3-management";
 
     protected abstract String getServerUrl();
 
@@ -31,4 +31,9 @@ protected Map<String, String> containerEnvironment() {
         env.put("RABBITMQ_DEFAULT_PASS", account().password());
         return env;
     }
+
+    @Override
+    public String defaultImage() {
+        return "quay.io/rh_integration/rabbitmq:3-management";
+    }
 }
diff --git a/system-x/services/redis/src/main/java/software/tnb/redis/service/Redis.java b/system-x/services/redis/src/main/java/software/tnb/redis/service/Redis.java
@@ -24,6 +24,6 @@ public RedisValidation validation() {
 
     @Override
     public String defaultImage() {
-        return "quay.io/fuse_qe/redis-image:6.0.20-alpine";
+        return "quay.io/fuse_qe/redis-image:6.0.20";
     }
 }