diff --git a/.env.default b/.env.default index 9113f14..c2e0b3a 100644 --- a/.env.default +++ b/.env.default @@ -1,5 +1,5 @@ -AWS_ACCESS_KEY_ID=dummy-123 -AWS_SECRET_ACCESS_KEY=dummy-123 +AWS_ACCESS_KEY_ID=dummy123 +AWS_SECRET_ACCESS_KEY=dummy123 AWS_S3_BUCKET_NAME=test-bucket AWS_S3_REGION_NAME=eu-central-1 AWS_S3_ENDPOINT_URL=http://localhost:9090 @@ -7,4 +7,4 @@ AWS_DB_REGION_NAME=eu-central-1 AWS_DB_TABLE_NAME=test-db AWS_DB_ENDPOINT_URL=http://localhost:8080 KML_STORAGE_HOST_URL=http://localhost:9090/test-bucket -ALLOWED_DOMAINS=.*localhost,.*admin\.ch,.*bgdi\.ch \ No newline at end of file +ALLOWED_DOMAINS=.*localhost,.*admin\.ch,.*bgdi\.ch diff --git a/.env.testing b/.env.testing index aa4f245..9de45cd 100644 --- a/.env.testing +++ b/.env.testing @@ -1,9 +1,9 @@ -AWS_ACCESS_KEY_ID=dummy-123 -AWS_SECRET_ACCESS_KEY=dummy-123 +AWS_ACCESS_KEY_ID=dummy123 +AWS_SECRET_ACCESS_KEY=dummy123 AWS_S3_BUCKET_NAME=test-bucket AWS_S3_REGION_NAME=wonderland # for some reason currently mocking the DynamoDB only works with a real region. # Fake regions will cause a crash when mocking. AWS_DB_REGION_NAME=us-east-1 AWS_DB_TABLE_NAME=test-db -ALLOWED_DOMAINS=.*\.geo\.admin\.ch,http://localhost \ No newline at end of file +ALLOWED_DOMAINS=.*\.geo\.admin\.ch,http://localhost diff --git a/README.md b/README.md index 145d78d..8f7bfb6 100644 --- a/README.md +++ b/README.md @@ -64,10 +64,10 @@ source .env.local export ENV_FILE=.env.local ``` -Then, you can run the dev target to ensure you have everything needed to develop, test and serve locally +Then, you can run the setup target to ensure you have everything needed to develop, test and serve locally ```bash -make dev +make setup ``` The other services that are used (DynamoDB local and [MinIO](https://www.min.io) as local S3 replacement) are wrapped in a docker compose. diff --git a/docker-compose.yml b/docker-compose.yml index b581462..1bc668b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: sleep 1; done; echo minio server is up; - /usr/bin/mc alias set minio http://s3:9000 dummy-123 dummy-123; + /usr/bin/mc alias set minio http://s3:9000 dummy123 dummy123; /usr/bin/mc mb minio/test-bucket; /usr/bin/mc policy set public minio/test-bucket; exit 0; @@ -76,6 +76,6 @@ services: links: - dynamodb-local environment: - - AWS_ACCESS_KEY_ID=dummy-123 - - AWS_SECRET_ACCESS_KEY=dummy-123 + - AWS_ACCESS_KEY_ID=dummy123 + - AWS_SECRET_ACCESS_KEY=dummy123 - AWS_DEFAULT_REGION=wonderland diff --git a/minio.env b/minio.env index a5b89d9..b779fca 100644 --- a/minio.env +++ b/minio.env @@ -1,2 +1,2 @@ -MINIO_ACCESS_KEY=dummy-123 -MINIO_SECRET_KEY=dummy-123 +MINIO_ACCESS_KEY=dummy123 +MINIO_SECRET_KEY=dummy123