Merge branch 'nocross-nomusl' of https://github.com/iav/lemmy into iav-nocross-nomusl
This commit is contained in:
commit
f36178e134
4 changed files with 92 additions and 0 deletions
4
docker/nocross/.env
vendored
Normal file
4
docker/nocross/.env
vendored
Normal file
|
@ -0,0 +1,4 @@
|
|||
DOMAIN=my_domain
|
||||
DATABASE_PASSWORD=password
|
||||
DATABASE_URL=postgres://lemmy:password@lemmy_db:5432/lemmy
|
||||
JWT_SECRET=changeme
|
60
docker/nocross/Dockerfile
vendored
Normal file
60
docker/nocross/Dockerfile
vendored
Normal file
|
@ -0,0 +1,60 @@
|
|||
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"]
|
26
docker/nocross/docker-compose.yml
vendored
Normal file
26
docker/nocross/docker-compose.yml
vendored
Normal file
|
@ -0,0 +1,26 @@
|
|||
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:
|
||||
- "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:
|
2
docker/nocross/docker_update.sh
vendored
Normal file
2
docker/nocross/docker_update.sh
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
docker-compose up -d --no-deps --build
|
Reference in a new issue