diff --git a/.gitignore b/.gitignore index 125ec90..68235e2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /TEST /target/ /files/ +/dependency-reduced-pom.xml diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..31ca556 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,33 @@ +FROM maven:latest as builder + +COPY . /workspace + +WORKDIR /workspace + +RUN mvn clean package + + + +FROM alpine:latest + +ENV UID=1000 +ENV GID=1000 + +RUN apk update && apk add openjdk17 shadow sudo + +COPY --from=builder /workspace/target/MdBlog-*.jar /mdblog/MdBlog.jar +COPY --from=mrletsplay/docker_launcher /usr/local/bin/docker_launcher /usr/local/bin/docker_launcher +COPY ./docker/launcher_config.json /mdblog/launcher_config.json + +RUN useradd mdblog + +RUN mkdir /mdblog/data && chown -R mdblog /mdblog/data + +VOLUME ["/mdblog/data"] + +WORKDIR /mdblog/data + +EXPOSE 3706 + +ENTRYPOINT [ "docker_launcher", "--config", "/mdblog/launcher_config.json", "sudo", "-u", "mdblog" ] +CMD [ "java", "-jar", "/mdblog/MdBlog.jar" ] diff --git a/docker/launcher_config.json b/docker/launcher_config.json new file mode 100644 index 0000000..64e3c10 --- /dev/null +++ b/docker/launcher_config.json @@ -0,0 +1,11 @@ +{ + "updateUID": true, + "user": "mdblog", + + "updateGID": true, + "group": "mdblog", + + "runBefore": [ + [ "chown", "-R", "mdblog:mdblog", "/mdblog" ] + ] +} diff --git a/pom.xml b/pom.xml index eb6b5ee..5c49f86 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - MDTest - MDTest - 0.0.1-SNAPSHOT + me.mrletsplay + MdBlog + 1.0-SNAPSHOT src/main/java @@ -13,8 +13,34 @@ 3.8.1 17 + UTF-8 + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + + me.mrletsplay.mdblog.MdBlog + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + diff --git a/src/main/java/me/mrletsplay/mdblog/blog/PostMetadata.java b/src/main/java/me/mrletsplay/mdblog/blog/PostMetadata.java index 36d15c3..0cd831e 100644 --- a/src/main/java/me/mrletsplay/mdblog/blog/PostMetadata.java +++ b/src/main/java/me/mrletsplay/mdblog/blog/PostMetadata.java @@ -15,7 +15,7 @@ public record PostMetadata(Instant date, String title, String author, Set tags = Collections.emptySet(); for(String line : metadataString.split("\n")) { - if(line.isEmpty()) continue; + if(line.isBlank()) continue; String[] spl = line.split(":", 2); if(spl.length != 2) { System.err.println("Invalid metadata line: " + line); diff --git a/src/main/resources/style/base.css b/src/main/resources/style/base.css index fefe07f..d779fce 100644 --- a/src/main/resources/style/base.css +++ b/src/main/resources/style/base.css @@ -1,7 +1,4 @@ body { - filter: invert(); + background-color: black; + color: white; } - -h1 { - background-color: red; -} \ No newline at end of file diff --git a/src/main/resources/style/post.css b/src/main/resources/style/post.css index 654c8be..e69de29 100644 --- a/src/main/resources/style/post.css +++ b/src/main/resources/style/post.css @@ -1,3 +0,0 @@ -h2 { - background-color: orange; -} \ No newline at end of file