aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile1
-rw-r--r--Makefile10
-rw-r--r--README.md21
3 files changed, 24 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index ac1c1d2..ec7abf5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ RUN set -e \
&& make \
&& make install \
&& cd /tmp/clog \
+ && make fetch-dependencies \
&& kodev build
FROM debian:bullseye-slim
diff --git a/Makefile b/Makefile
index 2b48b13..9511f88 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
all: build
-build:
+build: fetch-dependencies
kodev build
clean:
@@ -24,9 +24,11 @@ docker-run:
fetch-dependencies: clean
mkdir -p lib
# md4c
- curl -L https://github.com/mity/md4c/archive/refs/tags/release-0.4.8.tar.gz -o lib/md4c-0.4.8.tar.gz
- tar xf lib/md4c-0.4.8.tar.gz -C lib
- mv lib/md4c-release-0.4.8 lib/md4c
+ curl -L https://github.com/mity/md4c/archive/refs/tags/release-0.5.1.tar.gz -o lib/md4c-0.5.1.tar.gz
+ echo "2dca17c6175a7f11182943079c2a4f9adb5071433e3d3d05ba801ff794993f34 lib/md4c-0.5.1.tar.gz" > lib/md4c-0.5.1.tar.gz.sha256
+ sha256sum -c lib/md4c-0.5.1.tar.gz.sha256
+ tar xf lib/md4c-0.5.1.tar.gz -C lib
+ mv lib/md4c-release-0.5.1 lib/md4c
run:
kodev run
diff --git a/README.md b/README.md
index 5ff9959..28981b9 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,23 @@ An attempt to implement a blog in C, using the [kore.io](https://kore.io) framew
## Running
```sh
-make fetch-dependencies
docker compose up
```
+## Build and run locally
+
+Install kore & then:
+
+```sh
+make
+```
+
+Make sure a database is up & then
+
+```sh
+./run-local.sh
+```
+
## Notes
To run locally modify `conf/clog.conf`, comment out `root /var/chroot/` and uncomment
@@ -16,11 +29,11 @@ the `skip chroot` section:
```conf
privsep worker {
- runas clog
+ runas clog
- # root /var/chroot/
+ # root /var/chroot/
- skip chroot
+ skip chroot
}
```