rename docker-ephemeral to docker_ephemeral (#880)

Fixes #615

.gitignore

@@ -63,14 +63,14 @@ swagger-ui
 deploy/services-demo/resources/templates/*
 deploy/services-demo/conf/nginz/zwagger-ui/*
 
-deploy/docker-ephemeral/build/airdock_base-all/
-deploy/docker-ephemeral/build/airdock_base/
-deploy/docker-ephemeral/build/airdock_fakesqs-all/
-deploy/docker-ephemeral/build/airdock_fakesqs/
-deploy/docker-ephemeral/build/airdock_rvm-all/
-deploy/docker-ephemeral/build/airdock_rvm/
-deploy/docker-ephemeral/build/dynamodb_local/
-deploy/docker-ephemeral/build/smtp/
+deploy/dockerephemeral/build/airdock_base-all/
+deploy/dockerephemeral/build/airdock_base/
+deploy/dockerephemeral/build/airdock_fakesqs-all/
+deploy/dockerephemeral/build/airdock_fakesqs/
+deploy/dockerephemeral/build/airdock_rvm-all/
+deploy/dockerephemeral/build/airdock_rvm/
+deploy/dockerephemeral/build/dynamodb_local/
+deploy/dockerephemeral/build/smtp/
 
 # Ignore cabal files; use package.yaml instead
 *.cabal

README.md

@@ -143,7 +143,7 @@ Integration tests require all of the haskell services (brig, galley, cannon, gun
 Setting up these real, but in-memory internal and "fake" external dependencies is done easiest using [`docker-compose`](https://docs.docker.com/compose/install/). Run the following in a separate terminal (it will block that terminal, C-c to shut all these docker images down again):
 
 ```
-deploy/docker-ephemeral/run.sh
+deploy/dockerephemeral/run.sh
 ```
 
 Then, to run all integration tests:

deploy/services-demo/README.md

@@ -7,7 +7,7 @@ Use 2 different terminals and run:
 ```
 # On terminal 1, start the dependencies. Note that you should turn up the max memory
 # limit of docker. More on https://github.com/wireapp/wire-server/issues/326
-deploy/docker-ephemeral/run.sh
+deploy/dockerephemeral/run.sh
 ```
 
 ```

deploy/services-demo/demo.sh

@@ -73,7 +73,7 @@ function check_prerequisites() {
     nc -z 127.0.0.1 9042 \
         && nc -z 127.0.0.1 9200 \
         && nc -z 127.0.0.1 6379 \
-        || { echo "Databases not up. Maybe run 'deploy/docker-ephemeral/run.sh' in a separate terminal first?";  exit 1; }
+        || { echo "Databases not up. Maybe run 'deploy/dockerephemeral/run.sh' in a separate terminal first?";  exit 1; }
     if [ "$docker_deployment" = "false" ]; then
         test -f ${DIR}/../dist/brig \
             && test -f ${DIR}/../dist/galley \
@@ -127,7 +127,7 @@ function copy_nginz_configs() {
 }
 
 # brig,gundeck,galley use the amazonka library's 'Discover', which expects AWS credentials
-# even if those are not used/can be dummy values with the fake sqs/ses/etc containers used (see deploy/docker-ephemeral/docker-compose.yaml)
+# even if those are not used/can be dummy values with the fake sqs/ses/etc containers used (see deploy/dockerephemeral/docker-compose.yaml)
 export AWS_REGION=${AWS_REGION:-eu-west-1}
 export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-dummy}
 export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-dummy}

deploy/services-demo/docker-compose.yaml

@@ -1,5 +1,5 @@
 networks:
-  docker-ephemeral_demo_wire:
+  dockerephemeral_demo_wire:
     external: true
 
 version: '2'
@@ -30,7 +30,7 @@ services:
       - demo_wire_sqs:sqs
       - demo_wire_smtp:smtp
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   galley:
     image: quay.io/wire/galley
@@ -50,7 +50,7 @@ services:
     external_links:
       - demo_wire_cassandra:cassandra
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   gundeck:
     image: quay.io/wire/gundeck
@@ -72,7 +72,7 @@ services:
       - demo_wire_sqs:sqs
       - demo_wire_localstack:sns
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   cannon:
     image: quay.io/wire/cannon
@@ -86,7 +86,7 @@ services:
       - /configs/conf/cannon.demo-docker.yaml
     working_dir: /configs
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   cargohold:
     image: quay.io/wire/cargohold
@@ -102,7 +102,7 @@ services:
     external_links:
       - demo_wire_s3:s3
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   proxy:
     image: quay.io/wire/proxy
@@ -116,7 +116,7 @@ services:
       - /configs/conf/proxy.demo.yaml
     working_dir: /configs
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   spar:
     image: quay.io/wire/spar
@@ -132,7 +132,7 @@ services:
     external_links:
       - demo_wire_cassandra:cassandra
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire
 
   nginz:
     image: quay.io/wire/nginz
@@ -157,4 +157,4 @@ services:
       - /configs/conf/nginz/nginx-docker.conf
     working_dir: /configs
     networks:
-      - docker-ephemeral_demo_wire
+      - dockerephemeral_demo_wire

services/brig/brig.integration.yaml

@@ -24,7 +24,7 @@ gundeck:
   host: 127.0.0.1
   port: 8086
 
-# You can set up local SQS/Dynamo running e.g. `../../deploy/docker-ephemeral/run.sh`
+# You can set up local SQS/Dynamo running e.g. `../../deploy/dockerephemeral/run.sh`
 aws:
   userJournalQueue: integration-user-events.fifo
   # ^ Comment this out if you don't want to journal user events

services/integration.sh

@@ -37,7 +37,7 @@ function check_prerequisites() {
     if ! ( nc -z 127.0.0.1 9042 \
         && nc -z 127.0.0.1 9200 \
         && nc -z 127.0.0.1 6379 ); then
-        echo "Databases not up. Maybe run 'deploy/docker-ephemeral/run.sh' in a separate terminal first?";  exit 1;
+        echo "Databases not up. Maybe run 'deploy/dockerephemeral/run.sh' in a separate terminal first?";  exit 1;
     fi
     if   [ ! -f "${TOP_LEVEL}/dist/brig" ] \
       && [ ! -f "${TOP_LEVEL}/dist/galley" ] \
@@ -65,7 +65,7 @@ if [[ $INTEGRATION_USE_REAL_AWS -eq 1 ]]; then
 else
     # brig,gundeck,galley use the amazonka library's 'Discover', which expects AWS credentials
     # even if those are not used/can be dummy values with the fake sqs/ses/etc containers used
-    # (see deploy/docker-ephemeral/docker-compose.yaml )
+    # (see deploy/dockerephemeral/docker-compose.yaml )
     echo 'Running tests using mocked AWS services'
     export AWS_REGION=eu-west-1
     export AWS_ACCESS_KEY_ID=dummykey