fix travis

Signed-off-by: Erin Schnabel <[email protected]>
gameontext · Aug 23, 2017 · b240f2e · b240f2e
1 parent c97e69c
commit b240f2e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,17 +6,18 @@ language: java
 jdk:
 - openjdk8
 env:
-- COMMIT=${TRAVIS_COMMIT::8}
-- REPO_IMAGE=${DOCKER_REPO}/${DOCKER_IMAGE}
+  global:
+  - COMMIT="${TRAVIS_COMMIT::8}"
+  - REPO_IMAGE="${DOCKER_REPO}/${DOCKER_IMAGE}"
 script:
 - echo "TRAVIS_BRANCH='$TRAVIS_BRANCH'" \
-  ;if [ "$TRAVIS_BRANCH" == "master" ]; then
+  ;if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
      echo "Building and Pushing new image" \
      && docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" && echo "Login ok" \
-     && docker build -t ${REPO_IMAGE}:${COMMIT} ${DOCKER_BUILDDIR} && echo "Build complete" \
+     && docker build -t ${REPO_IMAGE}:${COMMIT} ${DOCKER_BUILDDIR} && echo "Build complete ${REPO_IMAGE}:${COMMIT}" \
      && docker tag ${REPO_IMAGE}:${COMMIT} ${REPO_IMAGE}:latest \
      && docker tag ${REPO_IMAGE}:${COMMIT} ${REPO_IMAGE}:travis-${TRAVIS_BUILD_NUMBER} \
-     && docker push ${REPO_IMAGE} && echo "Push complete"
+     && docker push ${REPO_IMAGE}:${COMMIT} && echo "Push complete"
   ;else
      echo "Not master branch, skipping docker"
   ;fi

diff --git a/haproxy-dev.cfg b/haproxy-dev.cfg
@@ -98,9 +98,12 @@ frontend frontend-ssl
   use_backend room    if room
 
   acl roomjs  path_beg -i /roomjs
-  use_backend  roomjs  if roomjs
+  use_backend roomjs  if roomjs
 
-  acl swagger  path_beg -i /swagger
+  acl slackin path_beg -i /slackin
+  use_backend slackin if slackin
+
+  acl swagger path_beg -i /swagger
   use_backend swagger    if swagger
 
   default_backend static-content