Merge pull request 'yay' (#1) from dev into stable
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/manual/woodpecker Pipeline failed

Reviewed-on: #1
This commit is contained in:
hex 2024-11-18 12:07:51 +01:00
commit cfa6660f03
11 changed files with 29 additions and 27 deletions

View file

@ -1,18 +1,20 @@
# yes # yes
when: when:
branch: ['dev', 'stable'] branch: ["dev", "stable"]
event: ["push", "manual"] event: ["push", "manual"]
steps: steps:
- name: build - name: build
image: woodpeckerci/plugin-docker-buildx image: woodpeckerci/plugin-docker-buildx
secrets: [ gitpat ] secrets: [gitpat]
settings: settings:
repo: git.iwakura.rip/hex/disseminate repo: git.iwakura.rip/hex/jabe
platforms: linux/amd64 platforms: linux/amd64
dockerfile: Dockerfile dockerfile: Dockerfile
tags: ["${CI_COMMIT_BRANCH}-latest","${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}"] tags:
["${CI_COMMIT_BRANCH}-latest", "${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA}"]
username: hex username: hex
registry: git.iwakura.rip registry:
git.iwakura.rip
#insecure: true #insecure: true
password: password:
from_secret: gitpat from_secret: gitpat

View file

@ -18,7 +18,7 @@ It stems from an issue i've come across, where no blogging platform i could find
JABE is a work-in-progress, although it is in a more than usable state. JABE is a work-in-progress, although it is in a more than usable state.
## Blogs using Disseminate ## Blogs using JABE
- [My own :)](https://blog.iwakura.rip) - [My own :)](https://blog.iwakura.rip)

View file

@ -1,13 +1,13 @@
# Welcome to Disseminate! # Welcome to JABE
Welcome, user! We are glad to have you on board! Welcome, user! We are glad to have you on board!
To start, find the "posts" directory in the data folder you have created, or mounted using docker. To start, find the "posts" directory in the data folder you have created, or mounted using docker.
This is the same directory you put your config file in. This is the same directory you put your config file in.
Create a file named "hello.md", and start the file with:
Create a file named "hello.md", and start the file with:
``` ```
# [Your Title] # [Your Title]
``` ```
Now you can start writing blog posts!
Now you can start writing blog posts!

View file

@ -1,7 +1,7 @@
version: "3" version: "3"
services: services:
jabe: jabe:
container_name: disseminate container_name: jabe
image: git.iwakura.rip/hex/jabe:stable-latest image: git.iwakura.rip/hex/jabe:stable-latest
volumes: volumes:
- ./data:/app/data # bind mount is recommended. - ./data:/app/data # bind mount is recommended.

2
package-lock.json generated
View file

@ -1,5 +1,5 @@
{ {
"name": "disseminate", "name": "JABE",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {

View file

@ -1,4 +1,4 @@
cat << EOF cat <<EOF
____ ______________ __ ____ ______________ __
/ __ \/ _/ ___/ ___// / docker edition / __ \/ _/ ___/ ___// / docker edition
/ / / // / \__ \\__ \/ / launching bootstrapper... / / / // / \__ \\__ \/ / launching bootstrapper...
@ -9,7 +9,7 @@ EOF
if [ -z "$(find data -mindepth 1 -maxdepth 1)" ]; then if [ -z "$(find data -mindepth 1 -maxdepth 1)" ]; then
echo '[bootstrapper] data directory is empty, copying template.' echo '[bootstrapper] data directory is empty, copying template.'
cp -r data.template/* data/ cp -r data.template/* data/
chown -R disseminate:disseminate data/ chown -R jabe:jabe data/
fi fi
# echo "[bootstrapper] checking permissions for data folder" # echo "[bootstrapper] checking permissions for data folder"

View file

@ -1,4 +1,4 @@
# Disseminate Build Script # JABE Build Script
# This script builds disseminate into a docker container, using the dockerfile provided in the repository. # This script builds jabe into a docker container, using the dockerfile provided in the repository.
docker buildx build --build-arg UID=1000 --build-arg GID=1000 . -t disseminate:latest docker buildx build --build-arg UID=1000 --build-arg GID=1000 . -t jabe:latest

View file

@ -1,8 +1,8 @@
# Disseminate docker test script # JABE docker test script
mkdir ignore mkdir ignore
cd ignore cd ignore
docker run --rm -it -p 3024:3024 -v ./data:/app/data disseminate:latest docker run --rm -it -p 3024:3024 -v ./data:/app/data jabe:latest
cd .. cd ..
rm -R ignore rm -R ignore

View file

@ -1,7 +1,7 @@
# Disseminate docker test script # JABE docker test script
mkdir ignore mkdir ignore
cd ignore cd ignore
docker run --rm -it -p 3024:3024 --user 1000:1000 -v ./data:/app/data disseminate:latest /bin/bash docker run --rm -it -p 3024:3024 --user 1000:1000 -v ./data:/app/data jabe:latest /bin/bash
cd .. cd ..
rm ignore rm ignore

View file

@ -1,3 +1,3 @@
<div id="footer-content"> <div id="footer-content">
<a style="color: gray !important; opacity: 30%;" href="https://git.clatter.cc/hexlocation/disseminate">powered by Disseminate</a> <a style="color: gray !important; opacity: 30%;" href="https://git.iwakura.rip/hex/jabe">powered by JABE</a>
</div> </div>

View file

@ -1,3 +1,3 @@
<div id="footer-content"> <div id="footer-content">
<a style="display: none;color: gray !important; opacity: 30%;" href="https://git.clatter.cc/hexlocation/disseminate">powered by Disseminate</a> <a style="display: none;color: gray !important; opacity: 30%;" href="https://git.iwakura.rip/hex/jabe">powered by JABE</a>
</div> </div>