From de98c400c79bbcc2a4bb3722c14c379f93a34c84 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sun, 4 Jan 2026 20:48:57 +0100 Subject: [PATCH] preparing for gitea action workflow Signed-off-by: Stephan Richter --- Dockerfile | 21 ++++++--------------- build.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b2c3db..d8de5a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,17 @@ FROM alpine AS build -RUN apk update \ - && apk add openjdk21-jre -RUN apk add bash clang-extra-tools git +RUN apk update apk add openjdk21-jre +RUN apk add bash git ADD . /OpenCloudCal WORKDIR /OpenCloudCal -RUN VERSION=$(clang-format --version | sed -e "s/.* //g") && sed -i "s|clangFormat(.*).style|clangFormat(\"$VERSION\").style|g" build.gradle.kts RUN ./gradlew build RUN mv *app/build/distributions/*.zip /occ.zip FROM alpine -RUN apk update \ - && apk add bash openjdk21-jre +RUN apk update apk add bash openjdk21-jre COPY --from=build /occ.zip /opt/occ.zip -RUN cd /opt \ - && unzip occ.zip \ - && mv de.srsoftware.cal.app occ \ - && rm *.zip +RUN cd /opt && unzip occ.zip && mv de.srsoftware.cal.app occ && rm *.zip WORKDIR /opt/occ -RUN mkdir lib/importers \ - && cp lib/*importer*jar lib/importers/ -RUN adduser -S occ \ - && ln -s /data /home/occ/.config - +RUN mkdir lib/importers && cp lib/*importer*jar lib/importers/ +RUN adduser -S occ && ln -s /data /home/occ/.config USER occ ENTRYPOINT /opt/occ/bin/de.srsoftware.cal.app \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 24c2f9c..a1707ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ spotless { target("**/src/**/java/**/*.java") removeUnusedImports() importOrder() - licenseHeader("/* © SRSoftware 2024 */") + licenseHeader("/* © SRSoftware 2026 */") } }