diff --git a/Dockerfile.Nginx b/Dockerfile.Nginx new file mode 100644 index 0000000..0d0952f --- /dev/null +++ b/Dockerfile.Nginx @@ -0,0 +1,2 @@ +FROM nginx +COPY nginx-default.conf /etc/nginx/conf.d/default.conf diff --git a/README.md b/README.md new file mode 100644 index 0000000..74293a5 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +```sh +cd /code/ +git clone --recurse-submodules https://gitea.parrrate.ru/PTV/radn-rs.git +``` diff --git a/docker-compose.yml b/docker-compose.yml index 618569f..c41f7d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,5 @@ networks: + radn: {} v6d: external: true @@ -14,9 +15,9 @@ services: volumes: - radn-rs:/code/ networks: - v6d: {} + radn: {} tty: true - stop_signal: SIGINT + stop_signal: SIGKILL radn-rs-dd: container_name: radn-rs-dd build: @@ -25,7 +26,7 @@ services: volumes: - radn-rs:/code/:ro networks: - v6d: {} + radn: {} book-monads: container_name: book-monads build: @@ -35,7 +36,7 @@ services: - radn-rs:/code/:ro - book-monads:/data/book/:rw networks: - v6d: {} + radn: {} tty: true stop_signal: SIGINT book-radn: @@ -47,6 +48,16 @@ services: - radn-rs:/code/:ro - book-radn:/data/book/:rw networks: - v6d: {} + radn: {} tty: true stop_signal: SIGINT + nginx: + container_name: radn-nginx + build: + context: . + dockerfile: Dockerfile.Nginx + networks: + radn: {} + v6d: {} + ports: + - "7080:80" diff --git a/nginx-default.conf b/nginx-default.conf new file mode 100644 index 0000000..ab8cc8b --- /dev/null +++ b/nginx-default.conf @@ -0,0 +1,59 @@ +server { + listen 80; + listen [::]:80; + server_name radn.parrrate.ru; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + location /live/docs/ { + proxy_pass http://radn-rs-dd/; + } +} + +server { + listen 80; + listen [::]:80; + server_name book-monads.parrrate.ru; + + location / { + proxy_pass http://book-monads/; + } + + location /__livereload { + proxy_pass http://book-monads/__livereload; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } +} + +server { + listen 80; + listen [::]:80; + server_name book-radn.parrrate.ru; + + location / { + proxy_pass http://book-radn/; + } + + location /__livereload { + proxy_pass http://book-radn/__livereload; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } +} + +server { + listen 80; + listen [::]:80; + server_name *.parrrate.ru; +} diff --git a/radn-rs/Dockerfile b/radn-rs/Dockerfile index 720771d..699bfee 100644 --- a/radn-rs/Dockerfile +++ b/radn-rs/Dockerfile @@ -4,5 +4,7 @@ RUN cargo install cargo-watch RUN rustup component add rustfmt RUN rustup component add clippy RUN cargo install mdbook +RUN apt-get update +RUN apt-get install -y cloc WORKDIR /code/