From e3e9a022f800cae74a30dc9288eb63af8ac82bdc Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Fri, 3 Aug 2018 14:07:15 -0400 Subject: [PATCH 1/5] Remove unused import --- atst/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atst/app.py b/atst/app.py index a9e95c32..9a8372c3 100644 --- a/atst/app.py +++ b/atst/app.py @@ -1,7 +1,7 @@ import os import re from configparser import ConfigParser -from flask import Flask, request, g, session +from flask import Flask, request, g from flask_session import Session import redis from unipath import Path From 97d3fffc2c3629d3799e7e6a10231ac5f6deb9dc Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Fri, 3 Aug 2018 14:57:22 -0400 Subject: [PATCH 2/5] Remove quotes from base config --- config/base.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/base.ini b/config/base.ini index 7e47675b..3e52d420 100644 --- a/config/base.ini +++ b/config/base.ini @@ -16,7 +16,7 @@ PGPORT = 5432 PGUSER = postgres PGPASSWORD = postgres PGDATABASE = atat -SESSION_TYPE = "redis" +SESSION_TYPE = redis SESSION_COOKIE_DOMAIN= "atat.codes" SESSION_COOKIE_SECURE = True SESSION_USE_SIGNER = True From 17fd154c20ff0b3f048dd586d3c25939cb04f372 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Fri, 3 Aug 2018 15:20:17 -0400 Subject: [PATCH 3/5] Startup redis similar to postgres --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49883310..57ffe7e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,12 @@ before_install: before_script: - docker run -d --name postgres96 postgres:9.6-alpine - - docker run --link postgres96:postgres96 waisbrot/wait + - docker run -d --name redis redis:4.0.10-alpine + - docker run --link postgres96:postgres96 --link redis:redis waisbrot/wait - export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)" + - export redis_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" redis)" - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL - - docker build --tag "${TESTER_IMAGE_NAME}" --add-host "postgreshost:${postgres_ip}" . -f deploy/docker/tester/Dockerfile + - docker build --tag "${TESTER_IMAGE_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile script: - docker run --add-host "postgreshost:${postgres_ip}" "${TESTER_IMAGE_NAME}" From 6c01b614b94c7246893cfdf5e495be33ff6e225c Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Fri, 3 Aug 2018 15:21:20 -0400 Subject: [PATCH 4/5] Configure CI redis URI --- config/ci.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ci.ini b/config/ci.ini index 64c8ac1f..ebf2036e 100644 --- a/config/ci.ini +++ b/config/ci.ini @@ -1,3 +1,4 @@ [default] PGHOST = postgreshost PGDATABASE = atat_test +REDIS_URI = redis://redishost:6379 From 786c3589c8e455726fcde82f6b805fe5033749b1 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Fri, 3 Aug 2018 15:54:29 -0400 Subject: [PATCH 5/5] Add redishost when running tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 57ffe7e8..94b83396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_script: - docker build --tag "${TESTER_IMAGE_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile script: - - docker run --add-host "postgreshost:${postgres_ip}" "${TESTER_IMAGE_NAME}" + - docker run --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" "${TESTER_IMAGE_NAME}" before_deploy: - docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile