fix some samples after releasing v2 (#212)

localstack-samples · May 4, 2023 · e5561f7 · e5561f7
1 parent 9726bee
commit e5561f7
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -20,8 +20,8 @@ jobs:
       with:
         node-version: 14
 
-# see https://github.com/localstack/localstack/pull/6831
-# remove once no longer needed
+    # see https://github.com/localstack/localstack/pull/6831
+    # remove once no longer needed
     - name: Fix pyOpenSSL version
       run:  pip install --upgrade pyOpenSSL
 
@@ -40,7 +40,7 @@ jobs:
         git config --global user.name "Localstack Pro-Samples"
 
     - name: Pull the latest docker image
-      run: docker pull localstack/localstack
+      run: docker pull localstack/localstack-pro
 
     - name: Execute tests
       env:

diff --git a/athena-s3-queries/Makefile b/athena-s3-queries/Makefile
@@ -10,7 +10,6 @@ install:     ## Install dependencies
 #	@test -e node_modules || npm install
 	@which localstack || pip install localstack
 	@which awslocal || pip install awscli-local
-	docker pull localstack/bigdata
 
 run:         ## Set up database connections and run Athena queries locally
 	@make install; \

diff --git a/glue-etl-jobs/run.sh b/glue-etl-jobs/run.sh
@@ -27,7 +27,7 @@ awslocal glue create-table --database legislators \
 awslocal glue create-connection \
   --connection-input '{"Name": "'$CONNECTION_NAME'", "ConnectionType": "JDBC", "ConnectionProperties": {"USERNAME": "test", "PASSWORD": "test", "JDBC_CONNECTION_URL": "jdbc:postgresql://localhost.localstack.cloud:'$db_port'"}}'
 
-secret=$(awslocal secretsmanager create-secret --name mysecret --secret-string "12345678" | jq -r ".ARN")
+secret=$(awslocal secretsmanager create-secret --name pass --secret-string "test" | jq -r ".ARN")
 
 echo Creating Postgres database tables with data ...
 awslocal rds-data execute-statement --resource-arn arn:aws:rds:us-east-1:000000000000:cluster:$CLUSTER_IDENTIFIER --secret-arn $secret --sql 'CREATE TABLE IF NOT EXISTS persons(id varchar, name varchar)'

diff --git a/glue-redshift-crawler/Makefile b/glue-redshift-crawler/Makefile
@@ -8,7 +8,6 @@ usage:     ## Show this help
 install:   ## Install dependencies
 	@which localstack || pip install localstack
 	@which awslocal || pip install awscli-local
-	docker pull localstack/bigdata
 
 run:    ## Prepare environment and run sample
 	./run.sh

diff --git a/java-notification-app/docker-compose.yml b/java-notification-app/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   localstack:
     container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
-    image: localstack/localstack
+    image: localstack/localstack-pro
     ports:
       - "127.0.0.1:4510-4559:4510-4559"  # external service port range
       - "127.0.0.1:4566:4566"            # LocalStack Edge Proxy
@@ -15,7 +15,7 @@ services:
       - LOCALSTACK_API_KEY=${LOCALSTACK_API_KEY-}
       - SMTP_HOST=smtp:1025
     volumes:
-      - "${TMPDIR:-/tmp}/localstack:/tmp/localstack"
+      - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
       - "/var/run/docker.sock:/var/run/docker.sock"
 
   smtp:

diff --git a/lambda-mounting-and-debugging/javascript/docker-compose.yml b/lambda-mounting-and-debugging/javascript/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   localstack:
     container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
-    image: localstack/localstack:latest
+    image: localstack/localstack-pro:latest
     ports:
       - "127.0.0.1:4566:4566"            # LocalStack Gateway
       - "127.0.0.1:4510-4559:4510-4559"  # external services port range

diff --git a/sample-archive/spring-cloud-function-microservice/docker-compose.yml b/sample-archive/spring-cloud-function-microservice/docker-compose.yml
@@ -19,7 +19,7 @@ version: "3.8"
 services:
   localstack:
     container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
-    image: localstack/localstack
+    image: localstack/localstack-pro
     network_mode: bridge
     ports:
       - "127.0.0.1:53:53"
@@ -41,5 +41,5 @@ services:
       - LAMBDA_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5050
       - LAMBDA_DOCKER_FLAGS=-p 127.0.0.1:5050:5050
     volumes:
-      - "${TMPDIR:-/tmp/}localstack:/tmp/localstack"
+      - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
       - "/var/run/docker.sock:/var/run/docker.sock"
diff --git a/testcontainers-java-sample/LocalStackTestcontainers/src/test/java/TestRDS.java b/testcontainers-java-sample/LocalStackTestcontainers/src/test/java/TestRDS.java
@@ -21,7 +21,7 @@
 
 public class TestRDS {
 
-    private DockerImageName localstackImage = DockerImageName.parse("localstack/localstack:1.4.0");
+    private DockerImageName localstackImage = DockerImageName.parse("localstack/localstack-pro:latest");
     private String api_key = System.getenv("LOCALSTACK_API_KEY");
 
     /**