diff options
author | Felix Ableitner <me@nutomic.com> | 2019-12-17 22:35:48 +0100 |
---|---|---|
committer | Felix Ableitner <me@nutomic.com> | 2019-12-27 17:28:46 +0100 |
commit | 1f7546789a3e9d4a095aa72ba69843259eb56fc6 (patch) | |
tree | ee10142913b4211b3719e108f70875e80325a22c /docker | |
parent | ddc913ba7cd7759c9ea63123cd7bb97e861fa00f (diff) |
update documentation, docker and ansible files
Diffstat (limited to 'docker')
-rw-r--r-- | docker/dev/.env | 22 | ||||
-rw-r--r-- | docker/dev/Dockerfile | 2 | ||||
-rw-r--r-- | docker/dev/Dockerfile.aarch64 | 1 | ||||
-rw-r--r-- | docker/dev/Dockerfile.armv7hf | 1 | ||||
-rw-r--r-- | docker/dev/Dockerfile.libc | 2 | ||||
-rw-r--r-- | docker/dev/config/config.hjson | 2 | ||||
-rw-r--r-- | docker/dev/docker-compose.yml | 21 | ||||
-rw-r--r-- | docker/k8s/lemmy.yml | 6 | ||||
-rw-r--r-- | docker/prod/.env | 22 | ||||
-rw-r--r-- | docker/prod/docker-compose.yml | 19 |
10 files changed, 30 insertions, 68 deletions
diff --git a/docker/dev/.env b/docker/dev/.env index 014ce5c3..4e1bf7f6 100644 --- a/docker/dev/.env +++ b/docker/dev/.env @@ -1,17 +1,5 @@ -DOMAIN=my_domain -DATABASE_PASSWORD=password -DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy -JWT_SECRET=changeme - -RATE_LIMIT_MESSAGE=30 -RATE_LIMIT_MESSAGE_PER_SECOND=60 -RATE_LIMIT_POST=6 -RATE_LIMIT_POST_PER_SECOND=600 -RATE_LIMIT_REGISTER=3 -RATE_LIMIT_REGISTER_PER_SECOND=3600 - -# Optional email fields -SMTP_SERVER= -SMTP_LOGIN= -SMTP_PASSWORD= -SMTP_FROM_ADDRESS=Domain.com Lemmy Admin <notifications@domain.com> +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/Dockerfile b/docker/dev/Dockerfile index 203643e1..080b7fb3 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -38,8 +38,10 @@ FROM alpine:3.10 RUN apk add libpq # Copy resources +COPY server/config /config COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy COPY --from=node /app/ui/dist /app/dist + RUN addgroup -g 1000 lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy RUN chown lemmy:lemmy /app/lemmy diff --git a/docker/dev/Dockerfile.aarch64 b/docker/dev/Dockerfile.aarch64 index dbbafbd3..1b08c64e 100644 --- a/docker/dev/Dockerfile.aarch64 +++ b/docker/dev/Dockerfile.aarch64 @@ -69,6 +69,7 @@ RUN addgroup --gid 1000 lemmy RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy # Copy resources +COPY server/config /app/config COPY --from=rust /app/server/ready /app/lemmy COPY --from=node /app/ui/dist /app/dist diff --git a/docker/dev/Dockerfile.armv7hf b/docker/dev/Dockerfile.armv7hf index 3770dfd7..67067a18 100644 --- a/docker/dev/Dockerfile.armv7hf +++ b/docker/dev/Dockerfile.armv7hf @@ -69,6 +69,7 @@ RUN addgroup --gid 1000 lemmy RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy # Copy resources +COPY server/config /config COPY --from=rust /app/server/ready /app/lemmy COPY --from=node /app/ui/dist /app/dist diff --git a/docker/dev/Dockerfile.libc b/docker/dev/Dockerfile.libc index 3603d528..22d8d910 100644 --- a/docker/dev/Dockerfile.libc +++ b/docker/dev/Dockerfile.libc @@ -65,8 +65,10 @@ RUN addgroup --gid 1000 lemmy RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy # Copy resources +COPY server/config /app/config COPY --from=rust /app/server/ready /app/lemmy COPY --from=node /app/ui/dist /app/dist + RUN chown lemmy:lemmy /app/lemmy USER lemmy EXPOSE 8536 diff --git a/docker/dev/config/config.hjson b/docker/dev/config/config.hjson new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/docker/dev/config/config.hjson @@ -0,0 +1,2 @@ +{ +} diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 4f8e5364..92a8ee45 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=${DATABASE_PASSWORD} + - POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD} - POSTGRES_DB=lemmy volumes: - lemmy_db:/var/lib/postgresql/data @@ -16,22 +16,11 @@ services: dockerfile: docker/dev/Dockerfile ports: - "127.0.0.1:8536:8536" - environment: - - LEMMY_FRONT_END_DIR=/app/dist - - DATABASE_URL=${DATABASE_URL} - - JWT_SECRET=${JWT_SECRET} - - HOSTNAME=${DOMAIN} - - RATE_LIMIT_MESSAGE=${RATE_LIMIT_MESSAGE} - - RATE_LIMIT_MESSAGE_PER_SECOND=${RATE_LIMIT_MESSAGE_PER_SECOND} - - RATE_LIMIT_POST=${RATE_LIMIT_POST} - - RATE_LIMIT_POST_PER_SECOND=${RATE_LIMIT_POST_PER_SECOND} - - RATE_LIMIT_REGISTER=${RATE_LIMIT_REGISTER} - - RATE_LIMIT_REGISTER_PER_SECOND=${RATE_LIMIT_REGISTER_PER_SECOND} - - SMTP_SERVER=${SMTP_SERVER} - - SMTP_LOGIN=${SMTP_LOGIN} - - SMTP_PASSWORD=${SMTP_PASSWORD} - - SMTP_FROM_ADDRESS=${SMTP_FROM_ADDRESS} + env_file: + - .env restart: always + volumes: + - ./config/config.hjson:/config/config.hjson:ro depends_on: - lemmy_db lemmy_pictshare: diff --git a/docker/k8s/lemmy.yml b/docker/k8s/lemmy.yml index f05b172e..8e105d60 100644 --- a/docker/k8s/lemmy.yml +++ b/docker/k8s/lemmy.yml @@ -14,13 +14,13 @@ spec: spec: containers: - env: - - name: DATABASE_URL + - name: LEMMY_DATABASE_URL # example: 'postgres://lemmy:password@db:5432/lemmy' value: CHANGE_ME - - name: HOSTNAME + - name: LEMMY_HOSTNAME # example: 'lemmy.example.com' value: CHANGE_ME - - name: JWT_SECRET + - name: LEMMY_JWT_SECRET # example: 'very-super-good-secret' value: CHANGE_ME - name: LEMMY_FRONT_END_DIR diff --git a/docker/prod/.env b/docker/prod/.env index 014ce5c3..4e1bf7f6 100644 --- a/docker/prod/.env +++ b/docker/prod/.env @@ -1,17 +1,5 @@ -DOMAIN=my_domain -DATABASE_PASSWORD=password -DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy -JWT_SECRET=changeme - -RATE_LIMIT_MESSAGE=30 -RATE_LIMIT_MESSAGE_PER_SECOND=60 -RATE_LIMIT_POST=6 -RATE_LIMIT_POST_PER_SECOND=600 -RATE_LIMIT_REGISTER=3 -RATE_LIMIT_REGISTER_PER_SECOND=3600 - -# Optional email fields -SMTP_SERVER= -SMTP_LOGIN= -SMTP_PASSWORD= -SMTP_FROM_ADDRESS=Domain.com Lemmy Admin <notifications@domain.com> +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/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 56a90534..9df9f19a 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -14,22 +14,11 @@ services: image: dessalines/lemmy:v0.5.0.3 ports: - "127.0.0.1:8536:8536" - environment: - - LEMMY_FRONT_END_DIR=/app/dist - - DATABASE_URL=${DATABASE_URL} - - JWT_SECRET=${JWT_SECRET} - - HOSTNAME=${DOMAIN} - - RATE_LIMIT_MESSAGE=${RATE_LIMIT_MESSAGE} - - RATE_LIMIT_MESSAGE_PER_SECOND=${RATE_LIMIT_MESSAGE_PER_SECOND} - - RATE_LIMIT_POST=${RATE_LIMIT_POST} - - RATE_LIMIT_POST_PER_SECOND=${RATE_LIMIT_POST_PER_SECOND} - - RATE_LIMIT_REGISTER=${RATE_LIMIT_REGISTER} - - RATE_LIMIT_REGISTER_PER_SECOND=${RATE_LIMIT_REGISTER_PER_SECOND} - - SMTP_SERVER=${SMTP_SERVER} - - SMTP_LOGIN=${SMTP_LOGIN} - - SMTP_PASSWORD=${SMTP_PASSWORD} - - SMTP_FROM_ADDRESS=${SMTP_FROM_ADDRESS} + env_file: + - .env restart: always + volumes: + - ./config.hjson:/config/config.hjson:ro depends_on: - lemmy_db lemmy_pictshare: |