Merge pull request #5 from galhardi/feature/localstack-version

Receive localstack version as param

Author: Fabiano Oliveira

src/main/java/xyz/fabiano/spring/localstack/LocalstackDockerBuilder.java

@@ -28,6 +28,8 @@ public class LocalstackDockerBuilder {
 
     private boolean cborEnable = false;
 
+    private String version = "latest";
+
     private Collection<String> options = new ArrayList<>();
 
     private String region = "us-east-1";
@@ -46,6 +48,7 @@ public LocalstackDocker build() {
 
         docker.setEnvironmentVariables(environmentVariables);
         docker.setOptions(options);
+        docker.setVersion(version);
         docker.setRegion(region);
         return docker;
     }
@@ -129,6 +132,11 @@ public LocalstackDockerBuilder withOptions(Collection<String> options) {
         return this;
     }
 
+    public LocalstackDockerBuilder withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
     public LocalstackDockerBuilder withRegion(String region) {
         this.region = region;
         return this;

src/main/java/xyz/fabiano/spring/localstack/autoconfigure/LocalstackAutoConfiguration.java

@@ -34,6 +34,7 @@ public class LocalstackAutoConfiguration {
     private final String services;
     private final boolean autoRemove;
     private final String extraOptions;
+    private final String version;
     private final String region;
 
     public LocalstackAutoConfiguration(
@@ -44,6 +45,7 @@ public LocalstackAutoConfiguration(
         @Value("${spring.localstack.services:}") String services,
         @Value("${spring.localstack.auto-remove:true}") boolean autoRemove,
         @Value("${spring.localstack.extra-options:}") String extraOptions,
+        @Value("${spring.localstack.version:latest}") String version) {
         @Value("${spring.localstack.region:us-east-1}") String region) {
         this.asyncClientsEnabled = asyncClientsEnabled;
         this.pullNewImage = pullNewImage;
@@ -52,6 +54,7 @@ public LocalstackAutoConfiguration(
         this.services = services;
         this.autoRemove = autoRemove;
         this.extraOptions = extraOptions;
+        this.version = version;
         this.region = region;
     }
 
@@ -64,6 +67,7 @@ public LocalstackDocker localstackDocker() {
             .disableCBOR()
             .withServices(services())
             .withOptions(options())
+            .withVersion(version)
             .withRegion(region)
             .build();
 

src/main/java/xyz/fabiano/spring/localstack/legacy/Container.java

@@ -50,14 +50,16 @@ public static Container createLocalstackContainer(String externalHostName,
                                                       boolean randomizePorts,
                                                       Map<String, String> environmentVariables,
                                                       Collection<String> options,
+                                                      String version,
                                                       String region) {
-
+        String imageName = LOCALSTACK_NAME + ":" + version;
+      
         if(pullNewImage) {
             LOG.info("Pulling latest image...");
-            new PullCommand(LOCALSTACK_NAME).execute();
+            new PullCommand(imageName).execute();
         }
 
-        String containerId = new RunCommand(LOCALSTACK_NAME)
+        String containerId = new RunCommand(imageName)
                 .withOptions(options)
                 .withExposedPorts(LOCALSTACK_PORTS, randomizePorts)
                 .withEnvironmentVariable(LOCALSTACK_EXTERNAL_HOSTNAME, externalHostName)

src/main/java/xyz/fabiano/spring/localstack/legacy/LocalstackDocker.java

@@ -56,6 +56,7 @@ public class LocalstackDocker {
     @Setter
     private Collection<String> options = new ArrayList<>();
     @Setter
+    private String version = "latest";
     @Getter
     private String region = "us-east-1";
 
@@ -78,6 +79,7 @@ public void startup() {
                 randomizePorts,
                 environmentVariables,
                 options,
+                version,
                 region);
             loadServiceToPortMap();