diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 2c8f33e..ef72688 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -9,13 +9,6 @@ jobs: - name: Clone Repository uses: actions/checkout@v4 - - name: Login to registry - uses: docker/login-action@v2 - with: - registry: ${{ secrets.REGISTRY_PATH }} - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASS }} - - name: Build docker image run: docker build -t web4rail . diff --git a/Dockerfile b/Dockerfile index c59ee72..51dda7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,21 +4,25 @@ RUN apk add maven COPY . /w4r WORKDIR /w4r RUN mvn clean install \ - && cp target/web4rail*dependencies.jar resources/w4r.jar \ - && chmod +x resources/w4r.jar + && cp target/web4rail*dependencies.jar /w4r.jar \ + && chmod +x /w4r.jar FROM docker.srsoftware.de/basic_tools:alpine RUN apk add openjdk21-jre-headless RUN apk add tzdata ENV TZ=Europe/Berlin -ENV LANG de_DE.UTF-8 -ENV LANGUAGE de_DE:de -ENV ENV LC_ALL de_DE.UTF-8 +ENV LANG=de_DE.UTF-8 +ENV LANGUAGE=de_DE:de +ENV ENV="LC_ALL de_DE.UTF-8" RUN ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime && echo Europe/Berlin > /etc/timezone RUN adduser --disabled-password --gecos "" --home /home/railman railman WORKDIR /home/railman -COPY --from=build /w4r/resources /home/railman/resources ADD demodata /home/railman +COPY --from=build /w4r.jar . +RUN chown -R railman . +USER railman +EXPOSE 8080 +ENTRYPOINT java -cp . -jar w4r.jar --start-trains \ No newline at end of file