diff options
| author | Dessalines <tyhou13@gmx.com> | 2019-12-28 16:06:37 -0500 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2019-12-28 16:11:03 -0500 |
| commit | 786be3fa668903b92ac280691c4e4e50470ad74c (patch) | |
| tree | 3914b0ce49f4657db50051560739bcc8126da39e /docker/dev | |
| parent | a3065ed39f871e251d2e3762219c78859cb51f06 (diff) | |
Config fixes.
- Adding front_end_dir to settings.
- Adding unit test for PasswordResetRequest encryption.
- Readme points to lemmy.hjson
- Fixing docker prod, dev, and ansible builds.
- Removing redundant env files, as all config is now in a single file.
- Some formatting fixes.
Diffstat (limited to 'docker/dev')
| -rw-r--r-- | docker/dev/.env | 5 | ||||
| -rw-r--r-- | docker/dev/config/config.hjson | 2 | ||||
| -rw-r--r-- | docker/dev/docker-compose.yml | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/docker/dev/.env b/docker/dev/.env deleted file mode 100644 index 4e1bf7f6..00000000 --- a/docker/dev/.env +++ /dev/null @@ -1,5 +0,0 @@ -LEMMY_DOMAIN=my_domain -LEMMY_DATABASE_PASSWORD=password -LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy -LEMMY_JWT_SECRET=changeme -LEMMY_FRONT_END_DIR=/app/dist diff --git a/docker/dev/config/config.hjson b/docker/dev/config/config.hjson deleted file mode 100644 index 2c63c085..00000000 --- a/docker/dev/config/config.hjson +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 92a8ee45..eabd334d 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -5,7 +5,7 @@ services: image: postgres:12-alpine environment: - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD} + - POSTGRES_PASSWORD=password - POSTGRES_DB=lemmy volumes: - lemmy_db:/var/lib/postgresql/data @@ -16,11 +16,9 @@ services: dockerfile: docker/dev/Dockerfile ports: - "127.0.0.1:8536:8536" - env_file: - - .env restart: always volumes: - - ./config/config.hjson:/config/config.hjson:ro + - ../lemmy.hjson:/config/config.hjson:ro depends_on: - lemmy_db lemmy_pictshare: |