From 2efefd5390f95b8d3e05fb3a3bd050434c5e9ac6 Mon Sep 17 00:00:00 2001 From: jwansek Date: Sun, 21 Apr 2024 18:51:11 -0400 Subject: Added three images, updated scripts --- docker-compose.yml | 6 +++--- scripts/export.sh | 2 +- scripts/update.sh | 2 +- static/images/20220401_222149.jpg | Bin 0 -> 38897 bytes static/images/GGBDzuSXMAA1Ktk.jpg | Bin 0 -> 65355 bytes static/images/IMG_20210824_175000.jpg | Bin 0 -> 3292970 bytes static/images/IMG_20230812_132400733_HDR.jpg | Bin 0 -> 3044563 bytes static/images/IMG_20230812_132632784_HDR.jpg | Bin 0 -> 3452950 bytes static/images/notstolenvalour4.png | Bin 0 -> 1752598 bytes static/index.md | 8 +------- 10 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 static/images/20220401_222149.jpg create mode 100644 static/images/GGBDzuSXMAA1Ktk.jpg create mode 100755 static/images/IMG_20210824_175000.jpg create mode 100755 static/images/IMG_20230812_132400733_HDR.jpg create mode 100755 static/images/IMG_20230812_132632784_HDR.jpg create mode 100644 static/images/notstolenvalour4.png diff --git a/docker-compose.yml b/docker-compose.yml index 2c3f483..50e50e2 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: . dockerfile: Dockerfile - image: jwansek/edaweb + image: reg.reaweb.uk/edaweb volumes: - /tmp/:/media/ISOs/ - ./static/:/app/static/ @@ -22,7 +22,7 @@ services: build: context: ./homelab-wiki dockerfile: Dockerfile - image: jwansek/edawiki2 + image: reg.reaweb.uk/edawiki2 volumes: - ./homelab-wiki/images:/var/www/html/images - ./homelab-wiki/LocalSettings.php:/var/www/html/LocalSettings.php @@ -41,7 +41,7 @@ services: build: context: ./nitter/nitter dockerfile: Dockerfile - image: jwansek/nitter:latest + image: reg.reaweb.uk/nitter:latest ports: - "127.0.0.1:7777:7777" # Replace with "8080:8080" if you don't use a reverse proxy volumes: diff --git a/scripts/export.sh b/scripts/export.sh index 4c4af2c..c65a6e9 100755 --- a/scripts/export.sh +++ b/scripts/export.sh @@ -9,4 +9,4 @@ read export_name echo "Exporting blog post " $id " to " $export_name touch $export_name -sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$export_name":/app/$export_name --network mariadb --rm jwansek/edaweb /app/parser.py export -i $id -u root -o $export_name +sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$export_name":/app/$export_name --network mariadb --rm reg.reaweb.uk/edaweb /app/parser.py export -i $id -u root -o $export_name diff --git a/scripts/update.sh b/scripts/update.sh index 5694e3a..b082f18 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -3,4 +3,4 @@ echo -n "Input blog post ID to update: " read id -sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$1":/app/$1 --network mariadb --rm jwansek/edaweb /app/parser.py update -i $id -u root -m $1 +sudo docker run -it --entrypoint python3 -v "$(pwd)/edaweb.conf":/app/edaweb.conf -v "$(pwd)/$1":/app/$1 --network mariadb --rm reg.reaweb.uk/edaweb /app/parser.py update -i $id -u root -m $1 diff --git a/static/images/20220401_222149.jpg b/static/images/20220401_222149.jpg new file mode 100644 index 0000000..d9fecae Binary files /dev/null and b/static/images/20220401_222149.jpg differ diff --git a/static/images/GGBDzuSXMAA1Ktk.jpg b/static/images/GGBDzuSXMAA1Ktk.jpg new file mode 100644 index 0000000..35e04e1 Binary files /dev/null and b/static/images/GGBDzuSXMAA1Ktk.jpg differ diff --git a/static/images/IMG_20210824_175000.jpg b/static/images/IMG_20210824_175000.jpg new file mode 100755 index 0000000..216c617 Binary files /dev/null and b/static/images/IMG_20210824_175000.jpg differ diff --git a/static/images/IMG_20230812_132400733_HDR.jpg b/static/images/IMG_20230812_132400733_HDR.jpg new file mode 100755 index 0000000..9f46bdc Binary files /dev/null and b/static/images/IMG_20230812_132400733_HDR.jpg differ diff --git a/static/images/IMG_20230812_132632784_HDR.jpg b/static/images/IMG_20230812_132632784_HDR.jpg new file mode 100755 index 0000000..82060d1 Binary files /dev/null and b/static/images/IMG_20230812_132632784_HDR.jpg differ diff --git a/static/images/notstolenvalour4.png b/static/images/notstolenvalour4.png new file mode 100644 index 0000000..f9e82e2 Binary files /dev/null and b/static/images/notstolenvalour4.png differ diff --git a/static/index.md b/static/index.md index 535f8c8..0f7ae48 100755 --- a/static/index.md +++ b/static/index.md @@ -1,7 +1,7 @@ ![(you)s](https://eda.gay/img/braindamage.png) ## haiiiiiii -my name is eden and im a 22yo (boymoder) computer science student. i made my own website to encourage others to do so too. +my name is eden and im a 22yo (boymoder) computer science/robotics postgrad student. i made my own website to encourage others to do so too. i'll post my thoughts on here sometimes, and use this site to link to other stuff i host [more about me](/thought?id=2). [click here for a random image of lio fotia](https://eda.gay/random?tags=lio_fotia) @@ -12,14 +12,8 @@ i'll post my thoughts on here sometimes, and use this site to link to other stuf ## FOSS alternative services -(some are currently down as i am temporarily hosting on a VPS instead of my [normal server](https://wiki.eda.gay)) - - [nextcloud - dropbox (+ much more!) alternative](https://nc.eda.gay) -- [invidious - youtube alternative](https://invidious.eda.gay) -- [nitter - alternative twitter frontend](https://nitter.eda.gay) - [git server - github alternative](https://git.eda.gay/) -- [another git server - this one with gitolite for authentication](https://cgit.eda.gay/gitolite-cgit-docker.git/about/) -- [bibliogram - less annoying instagram front end](https://bibliogram.eda.gay/applysettings/c8009ec7533d542a90bb1d41563435c1) - [jellyfin - web player for ~~legally downloaded~~ TV and films](https://jellyfin.eda.gay) - RIP emby! these sites are hosted on my [homelab system](https://wiki.eda.gay) -- cgit v1.2.3