From 0049f2ba39a2488f3a94694cd688da718c4eabc2 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 3 Jul 2025 07:10:02 -0700 Subject: [PATCH] test --- .gitea/workflows/base-build.yml | 33 ++++++++++++--------------------- testing/Dockerfile | 2 +- vanilla/Dockerfile | 11 +---------- 3 files changed, 14 insertions(+), 32 deletions(-) diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index ad5dde5..cc5dc1e 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -5,9 +5,6 @@ on: branches: - master paths: - - 'vanilla/Dockerfile' - - 'testing/Dockerfile' - - 'fabric/Dockerfile' - 'vanilla/**' - 'testing/**' - 'fabric/**' @@ -23,14 +20,12 @@ jobs: # - name: Set up QEMU for multi-platform builds # uses: docker/setup-qemu-action@v2 - - name: Set image tags and names id: vars run: | IMAGE_REGISTRY=gitea.fithwum.tech IMAGE_ORG=fithwum IMAGE_REPO=minecraft - IMAGE_NAME=minecraft # Set the tag based on the folder name (vanilla, TESTING, fabric) IMAGE_TAG_VANILLA=vanilla @@ -42,9 +37,9 @@ jobs: echo "IMAGE_TAG_FABRIC=${IMAGE_TAG_FABRIC}" >> $GITHUB_ENV # Set image names for each subfolder Dockerfile - IMAGE_VANILLA=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_NAME}:${IMAGE_TAG_VANILLA} - IMAGE_TESTING=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_NAME}:${IMAGE_TAG_TESTING} - IMAGE_FABRIC=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_NAME}:${IMAGE_TAG_FABRIC} + IMAGE_VANILLA=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_VANILLA} + IMAGE_TESTING=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_TESTING} + IMAGE_FABRIC=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}:${IMAGE_TAG_FABRIC} echo "IMAGE_VANILLA=${IMAGE_VANILLA}" >> $GITHUB_ENV echo "IMAGE_TESTING=${IMAGE_TESTING}" >> $GITHUB_ENV @@ -56,21 +51,17 @@ jobs: - name: Log in to Gitea Registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - # Build and Push Docker Images for vanilla, testing, fabric, docker-build - - name: Build and Push vanilla Docker Image + # Build and Push Vanilla Docker Image + - name: Build and Push Vanilla Docker Image run: | - docker buildx build --platform linux/amd64 \ - --push -t ${IMAGE_VANILLA} \ - ./vanilla + docker buildx build --platform linux/amd64 --push -t ${{ env.IMAGE_VANILLA }} ./vanilla - - name: Build and Push testing Docker Image + # Build and Push Testing Docker Image + - name: Build and Push Testing Docker Image run: | - docker buildx build --platform linux/amd64 \ - --push -t ${IMAGE_TESTING} \ - ./testing + docker buildx build --platform linux/amd64 --push -t ${{ env.IMAGE_TESTING }} ./testing - - name: Build and Push fabric Docker Image + # Build and Push Fabric Docker Image + - name: Build and Push Fabric Docker Image run: | - docker buildx build --platform linux/amd64 \ - --push -t ${IMAGE_FABRIC} \ - ./minecraft-fabric + docker buildx build --platform linux/amd64 --push -t ${{ env.IMAGE_FABRIC }} ./fabric diff --git a/testing/Dockerfile b/testing/Dockerfile index 32a7fa3..652466c 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get -y update \ # && update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/msopenjdk-21/bin/javac 1 # Install java -RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update && apt-get install -y msopenjdk-21 \ && apt-get -y update && apt-get -y --fix-broken install diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index 32a7fa3..28d9121 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -11,7 +11,6 @@ ENV XMN_SIZE="" # URL's for files ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/fabric/install_script.sh -ARG JAVA=https://aka.ms/download-jdk/microsoft-jdk-21.0.7-linux-x64.tar.gz # Install Dependencies. RUN apt-get -y update \ @@ -22,16 +21,8 @@ RUN apt-get -y update \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates -f; -# Install Microsoft OpenJDK 21 (manuall download) -# RUN wget "$JAVA" -O /tmp/msopenjdk-21.tar.gz \ -# && mkdir -p /usr/lib/jvm \ -# && tar -xvzf /tmp/msopenjdk-21.tar.gz -C /usr/lib/jvm \ -# && rm /tmp/msopenjdk-21.tar.gz \ -# && update-alternatives --install /usr/bin/java java /usr/lib/jvm/msopenjdk-21/bin/java 1 \ -# && update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/msopenjdk-21/bin/javac 1 - # Install java -RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update && apt-get install -y msopenjdk-21 \ && apt-get -y update && apt-get -y --fix-broken install