Add Docker files, Update styles
This commit is contained in:
parent
43771ff9d6
commit
ff4445035a
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/TEST
|
||||
/target/
|
||||
/files/
|
||||
/dependency-reduced-pom.xml
|
||||
|
33
docker/Dockerfile
Normal file
33
docker/Dockerfile
Normal file
@ -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" ]
|
11
docker/launcher_config.json
Normal file
11
docker/launcher_config.json
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
"updateUID": true,
|
||||
"user": "mdblog",
|
||||
|
||||
"updateGID": true,
|
||||
"group": "mdblog",
|
||||
|
||||
"runBefore": [
|
||||
[ "chown", "-R", "mdblog:mdblog", "/mdblog" ]
|
||||
]
|
||||
}
|
32
pom.xml
32
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">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>MDTest</groupId>
|
||||
<artifactId>MDTest</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<groupId>me.mrletsplay</groupId>
|
||||
<artifactId>MdBlog</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<build>
|
||||
<sourceDirectory>src/main/java</sourceDirectory>
|
||||
<plugins>
|
||||
@ -13,8 +13,34 @@
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<release>17</release>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>me.mrletsplay.mdblog.MdBlog</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.4.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
@ -15,7 +15,7 @@ public record PostMetadata(Instant date, String title, String author, Set<String
|
||||
String author = "Unknown Author";
|
||||
Set<String> 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);
|
||||
|
@ -1,7 +1,4 @@
|
||||
body {
|
||||
filter: invert();
|
||||
background-color: black;
|
||||
color: white;
|
||||
}
|
||||
|
||||
h1 {
|
||||
background-color: red;
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
h2 {
|
||||
background-color: orange;
|
||||
}
|
Loading…
Reference in New Issue
Block a user