Skip to content

Commit c35a25f

Browse files
fix(registry): Use cache host and port from confd
The registry was crashing when trying to read cache settings from unset environment variables. confd is now also population those settings. I also disabled the LRU cache as this requires a redis in LRU mode: http://redis.io/topics/config
1 parent 50e4216 commit c35a25f

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

registry/templates/config.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,18 @@ dev:
2727
# $ export SETTINGS_FLAVOR=prod
2828
prod:
2929
storage: s3
30-
storage_path: "_env:STORAGE_PATH:/prod"
30+
storage_path: /data
3131
# Amazon S3 Storage Configuration
3232
s3_access_key: {{ .deis_registry_s3accessKey }}
3333
s3_secret_key: {{ .deis_registry_s3secretKey }}
3434
s3_bucket: {{ .deis_registry_s3bucket }}
3535
s3_encrypt: {{ .deis_registry_s3encrypt }}
3636
s3_secure: {{ .deis_registry_s3secure }}
37-
# Enabling LRU cache for small files. This speeds up read/write on small files
38-
# when using a remote storage backend (like S3).
37+
# Enabling query cache on Redis
3938
cache:
40-
host: _env:CACHE_REDIS_HOST
41-
port: _env:CACHE_REDIS_PORT
42-
password: _env:CACHE_REDIS_PASSWORD
43-
cache_lru:
44-
host: _env:CACHE_LRU_REDIS_HOST
45-
port: _env:CACHE_LRU_REDIS_PORT
46-
password: _env:CACHE_LRU_REDIS_PASSWORD
39+
host: {{ .deis_cache_host }}
40+
port: {{ .deis_cache_port }}
41+
db: 1
4742
# Enabling these options makes the Registry send an email on each code Exception
4843
email_exceptions:
4944
smtp_host: {{ .deis_registry_smtpHost }}

0 commit comments

Comments
 (0)