-
-
Save jeffutter/eb5b31ea03b4af7c4a9ae0ac5f4d57e9 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/base.yml b/base.yml | |
| index a589745..a777c0a 100644 | |
| --- a/base.yml | |
| +++ b/base.yml | |
| @@ -131,7 +131,7 @@ services: | |
| DB_READONLY_HOSTNAME: mysql-skel | |
| DB_WRITEONLY_HOSTNAME: mysql-skel | |
| ELASTIC_SEARCH_HOST: elasticsearch-noport:9200 | |
| - REDIS_SERVERS: redis://redis:6379/0 | |
| + REDIS_SERVERS: redis://52.42.23.67:6379/0 | |
| website-ruby-gulp: | |
| image: "sbf_website-ruby-gulp${DOCKER_TAG}" | |
| @@ -171,7 +171,7 @@ services: | |
| ENVIRONMENT: "${VM_NAME}" | |
| SERVER_NAME: "${VM_NAME}" | |
| SERVER_ALIAS: "${VM_NAME}" | |
| - SESSION_SAVE_PATH: "tcp://redis:6379?database=0" | |
| + SESSION_SAVE_PATH: "tcp://52.42.23.67:6379?database=0" | |
| SITE_COOKIE_DOMAIN: ".${VM_NAME}" | |
| SITE_PATH: "http://${VM_NAME}/" | |
| SITE_PATH_SECURE: "https://${VM_NAME}/" | |
| diff --git a/docker-compose.yml b/docker-compose.yml | |
| index 1d8b1ea..e927a4d 100644 | |
| --- a/docker-compose.yml | |
| +++ b/docker-compose.yml | |
| @@ -39,7 +39,6 @@ services: | |
| env_file: config/secrets.yml | |
| depends_on: | |
| - mysql | |
| - - redis | |
| - elasticsearch | |
| - memcached | |
| - memcached2 | |
| @@ -78,7 +77,6 @@ services: | |
| env_file: config/secrets.yml | |
| depends_on: | |
| - mysql | |
| - - redis | |
| - elasticsearch | |
| - memcached | |
| - memcached2 | |
| @@ -101,7 +99,6 @@ services: | |
| env_file: config/secrets.yml | |
| depends_on: | |
| - mysql | |
| - - redis | |
| - elasticsearch | |
| - memcached | |
| - memcached2 | |
| @@ -122,7 +119,6 @@ services: | |
| - ../.irbrc:/root/.irbrc | |
| - ../.pryrc:/root/.pryrc | |
| depends_on: | |
| - - redis | |
| - api | |
| - elasticsearch | |
| - mysql | |
| @@ -157,7 +153,6 @@ services: | |
| - ../.pryrc:/root/.pryrc | |
| env_file: config/secrets.yml | |
| depends_on: | |
| - - redis | |
| - api | |
| - elasticsearch | |
| - mysql | |
| @@ -177,7 +172,6 @@ services: | |
| depends_on: | |
| - mysql-skel | |
| - elasticsearch-noport | |
| - - redis | |
| website-ruby-gulp: | |
| extends: | |
| @@ -239,6 +233,7 @@ services: | |
| XDEBUG_REMOTE_ENABLE: 1 | |
| XDEBUG_PROFILER_ENABLE: 1 | |
| XDEBUG_REMOTE_CONNECT_BACK: 1 | |
| + SESSION_SAVE_PATH: 'tcp://52.42.23.67:6379?database=0' | |
| volumes: | |
| - ./sbf-website-php:/usr/src/app | |
| - ../.history:/root/.history | |
| @@ -247,7 +242,6 @@ services: | |
| - mogile-tracker | |
| - mogile-node | |
| - api | |
| - - redis | |
| - memcached | |
| - memcached2 | |
| - elasticsearch | |
| @@ -355,15 +349,6 @@ services: | |
| depends_on: | |
| - mogile-node | |
| - redis: | |
| - extends: | |
| - file: base.yml | |
| - service: redis | |
| - environment: | |
| - HISTFILE: '/root/.history/bash' | |
| - volumes: | |
| - - ../.history:/root/.history | |
| - | |
| elasticsearch: | |
| extends: | |
| file: base.yml | |
| diff --git a/sbf-website-php/.env b/sbf-website-php/.env | |
| index 4e4e99d..a16faae 100755 | |
| --- a/sbf-website-php/.env | |
| +++ b/sbf-website-php/.env | |
| @@ -85,7 +85,7 @@ CACHE_SERVERS="memcached:11211|memcached2:11211" | |
| # Redis configurations | |
| REDIS_DATABASE=0 | |
| -REDIS_DOMAIN="redis" | |
| +REDIS_DOMAIN="52.42.23.67" | |
| REDIS_PASSWORD="" | |
| REDIS_PORT=6379 | |
| diff --git a/sbf-website-php/Dockerfile-5.5 b/sbf-website-php/Dockerfile-5.5 | |
| index b56c337..4e7eee9 100755 | |
| --- a/sbf-website-php/Dockerfile-5.5 | |
| +++ b/sbf-website-php/Dockerfile-5.5 | |
| @@ -23,7 +23,7 @@ ENV ENVIRONMENT production | |
| ENV ERROR_REPORTING 22519 | |
| ENV DISPLAY_ERRORS 0 | |
| ENV SESSION_SAVE_HANDLER redis | |
| -ENV SESSION_SAVE_PATH tcp://127.0.0.1:6379?database=0 | |
| +ENV SESSION_SAVE_PATH tcp://52.42.23.67:6379?database=0 | |
| ENV XDEBUG_SO "" | |
| ENV XDEBUG_REMOTE_AUTOSTART 0 | |
| ENV XDEBUG_REMOTE_ENABLE 0 | |
| diff --git a/sbf-website-ruby/.env b/sbf-website-ruby/.env | |
| index 8c55053..2b1f560 100755 | |
| --- a/sbf-website-ruby/.env | |
| +++ b/sbf-website-ruby/.env | |
| @@ -2,7 +2,7 @@ MEMCACHE_SERVERS=memcached:11211 | |
| # Redis settings - must be a single item or a list containing 'redis://<host>:<port>/<db> | |
| # ex: "redis://localhost:6379/0,redis://localhost:6380/0" | |
| -REDIS_SERVERS=redis://redis:6379/0 | |
| +REDIS_SERVERS=redis://52.42.23.67:6379/0 | |
| # Settings for session cookie - need to match frontend config in order to share session data | |
| COOKIE_KEY=PHPSESSID | |
| diff --git a/sbf-website-ruby/application/root/views/_js.erb b/sbf-website-ruby/application/root/views/_js.erb | |
| index 536e1c7..99406b1 100755 | |
| --- a/sbf-website-ruby/application/root/views/_js.erb | |
| +++ b/sbf-website-ruby/application/root/views/_js.erb | |
| @@ -9,6 +9,7 @@ | |
| requirejs.config({ | |
| //By default load any module IDs from js/lib | |
| + "waitSeconds": 10, | |
| baseUrl: '<%= js_base_path %>', | |
| shim: { | |
| 'jquery': { | |
| diff --git a/sbf-website-ruby/sbf-client-ruby/sbf-api/.env b/sbf-website-ruby/sbf-client-ruby/sbf-api/.env | |
| index 41f5be0..68ec3c7 100755 | |
| --- a/sbf-website-ruby/sbf-client-ruby/sbf-api/.env | |
| +++ b/sbf-website-ruby/sbf-client-ruby/sbf-api/.env | |
| @@ -19,7 +19,7 @@ MONGO_PORT=27017 | |
| MONGO_DATABASE=sbfapi | |
| # Redis | |
| -REDIS_HOST=redis | |
| +REDIS_HOST=52.42.23.67 | |
| REDIS_PORT=6379 | |
| MEMCACHE_SERVERS=memcached:11211,memcached2:11211 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment