mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-26 04:41:31 +00:00
Faster Docker build directly on host
This commit is contained in:
parent
1c1f3d1316
commit
a2363efd40
4 changed files with 40 additions and 8 deletions
6
.dockerignore
vendored
6
.dockerignore
vendored
|
@ -1,4 +1,6 @@
|
||||||
ui/node_modules
|
ui/node_modules
|
||||||
ui/dist
|
server/target/debug
|
||||||
server/target
|
!server/target/debug/lemmy_server
|
||||||
|
server/target/release
|
||||||
|
server/target/debug/incremental
|
||||||
.git
|
.git
|
||||||
|
|
16
docker/federation-test/Dockerfile
vendored
Normal file
16
docker/federation-test/Dockerfile
vendored
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
FROM ekidd/rust-musl-builder:1.38.0-openssl11
|
||||||
|
|
||||||
|
# Copy resources
|
||||||
|
COPY server/config/defaults.hjson /app/config/defaults.hjson
|
||||||
|
COPY server/target/debug/lemmy_server /app/lemmy
|
||||||
|
COPY ui/dist /app/dist
|
||||||
|
|
||||||
|
USER root
|
||||||
|
RUN mkdir /app/dist/documentation/
|
||||||
|
RUN addgroup --gid 1001 lemmy
|
||||||
|
RUN adduser --disabled-password --shell /bin/sh -u 1001 --ingroup lemmy lemmy
|
||||||
|
RUN chown lemmy:lemmy /app/ -R
|
||||||
|
USER lemmy
|
||||||
|
EXPOSE 8536
|
||||||
|
WORKDIR /app
|
||||||
|
CMD ["/app/lemmy"]
|
12
docker/federation-test/docker-compose.yml
vendored
12
docker/federation-test/docker-compose.yml
vendored
|
@ -2,9 +2,7 @@ version: '3.3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
lemmy_alpha:
|
lemmy_alpha:
|
||||||
build:
|
image: lemmy-federation-test:latest
|
||||||
context: ../../
|
|
||||||
dockerfile: docker/dev/Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:8536:8536"
|
- "127.0.0.1:8536:8536"
|
||||||
environment:
|
environment:
|
||||||
|
@ -15,6 +13,7 @@ services:
|
||||||
- LEMMY_FEDERATION_ENABLED=true
|
- LEMMY_FEDERATION_ENABLED=true
|
||||||
- LEMMY_FEDERATED_INSTANCE=lemmy_beta:8537
|
- LEMMY_FEDERATED_INSTANCE=lemmy_beta:8537
|
||||||
- LEMMY_PORT=8536
|
- LEMMY_PORT=8536
|
||||||
|
- RUST_BACKTRACE=1
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- lemmy_db_alpha
|
- lemmy_db_alpha
|
||||||
|
@ -24,6 +23,8 @@ services:
|
||||||
- POSTGRES_USER=lemmy
|
- POSTGRES_USER=lemmy
|
||||||
- POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD}
|
- POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD}
|
||||||
- POSTGRES_DB=lemmy
|
- POSTGRES_DB=lemmy
|
||||||
|
volumes:
|
||||||
|
- lemmy_db_alpha:/var/lib/postgresql/data
|
||||||
restart: always
|
restart: always
|
||||||
lemmy_pictshare_alpha:
|
lemmy_pictshare_alpha:
|
||||||
image: shtripok/pictshare:latest
|
image: shtripok/pictshare:latest
|
||||||
|
@ -34,9 +35,7 @@ services:
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
lemmy_beta:
|
lemmy_beta:
|
||||||
build:
|
image: lemmy-federation-test:latest
|
||||||
context: ../../
|
|
||||||
dockerfile: docker/dev/Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:8537:8537"
|
- "127.0.0.1:8537:8537"
|
||||||
environment:
|
environment:
|
||||||
|
@ -47,6 +46,7 @@ services:
|
||||||
- LEMMY_FEDERATION_ENABLED=true
|
- LEMMY_FEDERATION_ENABLED=true
|
||||||
- LEMMY_FEDERATED_INSTANCE=lemmy_alpha:8536
|
- LEMMY_FEDERATED_INSTANCE=lemmy_alpha:8536
|
||||||
- LEMMY_PORT=8537
|
- LEMMY_PORT=8537
|
||||||
|
- RUST_BACKTRACE=1
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- lemmy_db_beta
|
- lemmy_db_beta
|
||||||
|
|
14
docker/federation-test/run-federation-test.bash
vendored
Executable file
14
docker/federation-test/run-federation-test.bash
vendored
Executable file
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
pushd ../../ui/ || exit
|
||||||
|
yarn build
|
||||||
|
popd || exit
|
||||||
|
|
||||||
|
pushd ../../server/ || exit
|
||||||
|
cargo build
|
||||||
|
popd || exit
|
||||||
|
|
||||||
|
sudo docker build ../../ -f Dockerfile -t lemmy-federation-test:latest
|
||||||
|
|
||||||
|
sudo docker-compose up
|
Loading…
Reference in a new issue