diff --git a/.github/renovate/renovate.json b/.github/renovate/renovate.json index a282aeb15..4660516a6 100644 --- a/.github/renovate/renovate.json +++ b/.github/renovate/renovate.json @@ -36,6 +36,17 @@ "datasourceTemplate": "docker", "versioningTemplate": "docker" }, + { + "description": "Process update properties for docker images", + "fileMatch": [ + "^.*\\.properties" + ], + "matchStrings": [ + "\\*.+?\\`embedded\\.\\w+?\\.(dockerImage|docker\\-image)\\`.*\\'(?.*?):?(?[\\w+\\.\\-]*)'" + ], + "datasourceTemplate": "docker", + "versioningTemplate": "docker" + }, { "description": "Process update doc for docker images", "fileMatch": [ diff --git a/embedded-aerospike-enterprise/README.adoc b/embedded-aerospike-enterprise/README.adoc index 0457b6de7..3fc491100 100644 --- a/embedded-aerospike-enterprise/README.adoc +++ b/embedded-aerospike-enterprise/README.adoc @@ -24,7 +24,7 @@ ToxiProxy is a great tool for simulating network conditions, meaning that you ca * `embedded.aerospike.enabled` `(true|false, default is 'true')` * `embedded.aerospike.reuseContainer` `(true|false, default is 'false')` -* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server-enterprise:6.4.0.10')` +* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server-enterprise:6.3.0.16')` ** Aerospike Enterprise version must be not less then 6.3.0 * `embedded.aerospike.featureKey` base64 of a feature-key-file https://aerospike.com/docs/server/operations/configure/feature-key, default is null. **Warning: if not provided, the Aerospike Database EE evaluation feature key file will be used. That means you can use it internally only for Evaluation diff --git a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java index e2b6b7617..a127826f2 100644 --- a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java +++ b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java @@ -16,6 +16,8 @@ import java.io.IOException; +import static com.playtika.testcontainer.aerospike.AerospikeProperties.BEAN_NAME_AEROSPIKE; + @Slf4j @AutoConfiguration(after = EmbeddedAerospikeBootstrapConfiguration.class) @ConditionalOnExpression("${embedded.containers.enabled:true}") @@ -24,7 +26,7 @@ @PropertySource("classpath:/embedded-enterprise-aerospike.properties") public class SetupEnterpriseAerospikeBootstrapConfiguration { - private static final String DOCKER_IMAGE = "aerospike/aerospike-server-enterprise:6.3.0.16_1"; + private static final String DOCKER_IMAGE = "aerospike/aerospike-server-enterprise:6.3.0.16"; private static final String AEROSPIKE_DOCKER_IMAGE_PROPERTY = "embedded.aerospike.dockerImage"; private static final ImageVersion SUITABLE_IMAGE_VERSION = new ImageVersion(6, 3); private static final String TEXT_TO_DOCUMENTATION = "Documentation: https://github.com/PlaytikaOSS/testcontainers-spring-boot/blob/develop/embedded-aerospike-enterprise/README.adoc"; @@ -40,7 +42,7 @@ public void setEnvironment(Environment environment) { } @Autowired - @Qualifier(AerospikeProperties.BEAN_NAME_AEROSPIKE) + @Qualifier(BEAN_NAME_AEROSPIKE) public void setAerospikeContainer(GenericContainer aerospikeContainer) { this.aerospikeContainer = aerospikeContainer; } diff --git a/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties b/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties index fc1ea40cb..46efcc47a 100644 --- a/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties +++ b/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties @@ -1 +1 @@ -embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.3.0.16_1 +embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.3.0.16 diff --git a/embedded-aerospike/README.adoc b/embedded-aerospike/README.adoc index 47d1a4d0c..58b5f0372 100644 --- a/embedded-aerospike/README.adoc +++ b/embedded-aerospike/README.adoc @@ -19,8 +19,8 @@ ToxiProxy is a great tool for simulating network conditions, meaning that you ca * `embedded.aerospike.enabled` `(true|false, default is 'true')` * `embedded.aerospike.reuseContainer` `(true|false, default is 'false')` -* `embedded.aerospike.dockerImage` `(default is set to 'aerospike:ce-6.2.0.2')` -** You can pick wanted version on https://hub.docker.com/r/library/aerospike/tags/[dockerhub] +* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server:6.3.0.16')` +** You can pick wanted version on https://hub.docker.com/_/aerospike/tags[dockerhub] * `embedded.aerospike.featureKey` `(base64 of a feature-key-file https://aerospike.com/docs/server/operations/configure/feature-key, default is null) is only required for the EE image` * `embedded.aerospike.waitTimeoutInSeconds` `(default is 60 seconds)` * `embedded.toxiproxy.proxies.aerospike.enabled` Enables both creation of the container with ToxiProxy TCP proxy and a proxy to the `embedded-aerospike` container. diff --git a/embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/AerospikeProperties.java b/embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/AerospikeProperties.java index 4468584d0..179e34bf2 100644 --- a/embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/AerospikeProperties.java +++ b/embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/AerospikeProperties.java @@ -24,6 +24,6 @@ public class AerospikeProperties extends CommonContainerProperties { public String getDefaultDockerImage() { // Please don`t remove this comment. // renovate: datasource=docker - return "aerospike:ce-6.2.0.2"; + return "aerospike/aerospike-server:6.3.0.16"; } }