More, more subtle docker changes

script/cibuild

@@ -2,5 +2,5 @@
 set -e
 
 cd "$(dirname "$0")/.."
-docker build -t entitlements -f spec/acceptance/Dockerfile.entitlements-app .
-docker run -w "/data/entitlements-app" entitlements bash -c "script/test"
+docker build -t entitlements-app -f spec/acceptance/Dockerfile.entitlements-app .
+docker run -w "/data/entitlements-app" entitlements-app bash -c "script/test"

script/cibuild-entitlements-app-acceptance

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-export APP_NAME="entitlements"
+export APP_NAME="entitlements-app"
 export GIT_SERVER_NAME="git-server"
 export LDAP_SERVER_NAME="ldap-server"
 

script/cibuild-entitlements-app-code-lint

@@ -2,6 +2,6 @@
 set -e
 
 cd "$(dirname "$0")/.."
-docker build -t entitlements -f spec/acceptance/Dockerfile.entitlements-app .
-docker run -w "/data/entitlements-app/" entitlements \
+docker build -t entitlements-app -f spec/acceptance/Dockerfile.entitlements-app .
+docker run -w "/data/entitlements-app/" entitlements-app \
   bash -c "script/bootstrap && bin/rubocop "$@" lib/ spec/"