diff --git a/Dockerfile b/Dockerfile index 51dda7d..d4e3c9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ RUN apk add maven COPY . /w4r WORKDIR /w4r RUN mvn clean install \ - && cp target/web4rail*dependencies.jar /w4r.jar \ - && chmod +x /w4r.jar + && cp target/web4rail*dependencies.jar resources/w4r.jar \ + && chmod +x resources/w4r.jar FROM docker.srsoftware.de/basic_tools:alpine RUN apk add openjdk21-jre-headless @@ -20,9 +20,9 @@ RUN ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime && echo Europe/Berlin RUN adduser --disabled-password --gecos "" --home /home/railman railman WORKDIR /home/railman ADD demodata /home/railman -COPY --from=build /w4r.jar . -RUN chown -R railman . +COPY --from=build /w4r/resources /home/railman/resources +RUN mv resources/w4r.jar . && chown -R railman . USER railman EXPOSE 8080 -ENTRYPOINT java -cp . -jar w4r.jar --start-trains +CMD java -cp . -jar w4r.jar --start-trains \ No newline at end of file diff --git a/demodata/.config b/demodata/.config new file mode 120000 index 0000000..30fa1ce --- /dev/null +++ b/demodata/.config @@ -0,0 +1 @@ +config \ No newline at end of file diff --git a/demodata/config/Web4Rail/app.config b/demodata/config/Web4Rail/app.config index b33fedd..f05adf5 100644 --- a/demodata/config/Web4Rail/app.config +++ b/demodata/config/Web4Rail/app.config @@ -1,2 +1,2 @@ -name = demo +name = default port = 8080