From 1b162a49bb6e79a119ddce164387a95852d20428 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 1 Nov 2019 23:52:59 -0700 Subject: [PATCH] Removing nocross folder. Updating prod docker compose. --- docker/nocross/.env | 4 --- docker/nocross/Dockerfile | 60 ------------------------------- docker/nocross/docker-compose.yml | 26 -------------- docker/prod/.env | 7 ++++ docker/prod/docker-compose.yml | 4 +++ 5 files changed, 11 insertions(+), 90 deletions(-) delete mode 100644 docker/nocross/.env delete mode 100644 docker/nocross/Dockerfile delete mode 100644 docker/nocross/docker-compose.yml diff --git a/docker/nocross/.env b/docker/nocross/.env deleted file mode 100644 index f82502d7..00000000 --- a/docker/nocross/.env +++ /dev/null @@ -1,4 +0,0 @@ -DOMAIN=my_domain -DATABASE_PASSWORD=password -DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy -JWT_SECRET=changeme diff --git a/docker/nocross/Dockerfile b/docker/nocross/Dockerfile deleted file mode 100644 index 8818f2b9..00000000 --- a/docker/nocross/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -FROM node:12-buster as node - -WORKDIR /app/ui - -# Cache deps -COPY ui/package.json ui/yarn.lock ./ -RUN yarn install --pure-lockfile --network-timeout 100000 - -# Build -COPY ui /app/ui -RUN yarn build - - -FROM rust:1.37 as rust - -# Cache deps -WORKDIR /app -RUN USER=root cargo new server -WORKDIR /app/server -COPY server/Cargo.toml server/Cargo.lock ./ -RUN mkdir -p ./src/bin \ - && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs - -RUN cargo build -RUN rm -f ./target/debug/deps/lemmy_server* -COPY server/src ./src/ -COPY server/migrations ./migrations/ - -# build for release -#RUN cargo build --frozen --release -RUN cargo build --frozen - -# Get diesel-cli on there just in case -# RUN cargo install diesel_cli --no-default-features --features postgres - -# make result place always the same for lemmy container -RUN cp /app/server/target/debug/lemmy_server /app/server/ready - - -#FROM alpine:3.10 -# debian because build with dynamic linking with debian:buster -FROM debian:buster as lemmy - -# Install libpq for postgres -#RUN apk add libpq -RUN apt-get update && apt-get install -y libpq5 - -# Copy resources -#COPY --from=rust /app/server/target/$TARGET/debug/lemmy_server /app/lemmy -COPY --from=rust /app/server/ready /app/lemmy -COPY --from=node /app/ui/dist /app/dist -RUN addgroup --gid 1000 lemmy -# for alpine -#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy -# for debian -RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy -RUN chown lemmy:lemmy /app/lemmy -USER lemmy -EXPOSE 8536 -CMD ["/app/lemmy"] diff --git a/docker/nocross/docker-compose.yml b/docker/nocross/docker-compose.yml deleted file mode 100644 index d92810ad..00000000 --- a/docker/nocross/docker-compose.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: '3.3' - -services: - lemmy_db: - image: postgres:12-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=${DATABASE_PASSWORD} - - POSTGRES_DB=lemmy - volumes: - - lemmy_db:/var/lib/postgresql/data - lemmy: - build: - context: ../../ - dockerfile: docker/nocross/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} - depends_on: - - lemmy_db -volumes: - lemmy_db: diff --git a/docker/prod/.env b/docker/prod/.env index cca4deae..cf809d89 100644 --- a/docker/prod/.env +++ b/docker/prod/.env @@ -2,9 +2,16 @@ 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=3 RATE_LIMIT_POST_PER_SECOND=600 RATE_LIMIT_REGISTER=1 RATE_LIMIT_REGISTER_PER_SECOND=3600 + +# Optional email fields +SMTP_SERVER= +SMTP_LOGIN= +SMTP_PASSWORD= +SMTP_FROM_ADDRESS=Domain.com Lemmy Admin diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 14d530c1..4fd00724 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -24,6 +24,10 @@ services: - 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} restart: always depends_on: - lemmy_db -- 2.44.1