diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 095fe1a..7a60864 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -24,10 +24,12 @@ jobs: echo "version=$version" docker_version=$(curl -s https://git.tulisiowice.top/Tulis/-/packages/container/tulibuilder/versions | \ - grep -oE 'v[0-9]+\.[0-9]+\.[0-9]' | \ + grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | \ sort -V | \ tail -n 1 | sed 's/^v//') + echo "docker_version=$docker_version" + if [ "$(printf '%s\n' "$version" "$docker_version" | sort -V | tail -n 1)" = "$version" ] && [ "$version" != "$docker_version" ]; then echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.tulisiowice.top -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 120000 index 0000000..29d4588 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1 @@ +../../.gitea/workflows/build.yaml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 180e925..d79f78c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,23 +6,20 @@ ARG ENABLE_FLAG=false RUN echo $MINECRAFT_VERSION RUN mkdir /code /buildTools -RUN apt-get update && apt-get install -y maven openjdk-21-jdk wget git +RUN apt-get update +RUN apt-get install -y maven openjdk-21-jdk wget git WORKDIR /buildTools RUN wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar RUN java -jar BuildTools.jar --rev $MINECRAFT_VERSION -RUN wget -O maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.tar.gz WORKDIR /code FROM eclipse-temurin:21-alpine -# Kopiowanie spigot-api repozytorium COPY --from=builder /root/.m2/repository/org/spigotmc/spigot-api /root/.m2/repository/org/spigotmc/spigot-api -COPY --from=builder /buildTools/maven.tar.gz /root/maven.tar.gz - -RUN tar -xzf /root/maven.tar.gz -C /root/ && rm /root/maven.tar.gz +RUN apk add --no-cache maven RUN mkdir /code WORKDIR /code -ENTRYPOINT ["/root/apache-maven-3.9.12/bin/mvn", "package"] \ No newline at end of file +ENTRYPOINT ["mvn", "package"] \ No newline at end of file