Merge branch 'main' into fix_docker_install

This commit is contained in:
Dessalines 2022-11-19 19:37:49 -05:00
commit 1af9a97b3a
3 changed files with 18 additions and 3 deletions

View file

@ -14,6 +14,6 @@ steps:
- cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git --branch localization - cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git --branch localization
--rev 9d8147c --force --debug --rev 9d8147c --force --debug
- apt-get update - apt-get update
- apt-get install git -y - apt-get install git curl -y
- ./update-includes.sh - ./update-includes.sh
- mdbook build . - mdbook build .

View file

@ -18,3 +18,7 @@ cd server
```hjson ```hjson
{{#include ../../../include/config/defaults.hjson}} {{#include ../../../include/config/defaults.hjson}}
``` ```
## Lemmy-UI configuration
Lemmy-UI can be configured using environment variables, detailed in its [README](https://github.com/LemmyNet/lemmy-ui#readme).

View file

@ -1,4 +1,15 @@
#!/bin/bash #!/bin/bash
set -e set -e
git clone https://github.com/LemmyNet/lemmy.git include --depth 1 LEMMY_VERSION=$(curl "https://raw.githubusercontent.com/LemmyNet/lemmy-ansible/main/VERSION")
if [ ! -d "include/.git" ]
then
git clone https://github.com/LemmyNet/lemmy.git include
cd include
else
cd include
git checkout main
git pull
fi
git fetch --tags
git checkout "$LEMMY_VERSION"