diff --git a/Dockerfile b/Dockerfile index 27ff0cb..0a93e73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,19 @@ ARG BASE_IMAGE=eclipse-temurin:21-jre-alpine -ARG BUILD_IMAGE=eclipse-temurin:17-jdk +#ARG BUILD_IMAGE=eclipse-temurin:17-jdk -FROM ${BUILD_IMAGE} as viaaas-build +#FROM ${BUILD_IMAGE} as viaaas-build -ARG TARGETOS -ARG TARGETARCH -ARG TARGETVARIANT +#ARG TARGETOS +#ARG TARGETARCH +#ARG TARGETVARIANT -WORKDIR /builder +#WORKDIR /builder -RUN apt-get update && apt-get install -y git -RUN git clone -b dev https://github.com/ViaVersion/VIAaaS.git VIAaaS +#RUN apt-get update && apt-get install -y git +#RUN git clone -b dev https://github.com/ViaVersion/VIAaaS.git VIAaaS -WORKDIR /builder/VIAaaS -RUN ./gradlew build --no-daemon +#WORKDIR /builder/VIAaaS +#RUN ./gradlew build --no-daemon FROM ${BASE_IMAGE} as final @@ -24,7 +24,8 @@ ARG TARGETVARIANT COPY /root / WORKDIR /app -COPY --from=viaaas-build /builder/VIAaaS/build/libs/VIAaaS-*-all.jar /app/VIAaaS-all.jar +#COPY --from=viaaas-build /builder/VIAaaS/build/libs/VIAaaS-*-all.jar /app/VIAaaS-all.jar +RUN curl -Lf --output /app/VIAaaS-all.jar "https://jitpack.io/com/github/ViaVersion/VIAaaS/master-SNAPSHOT/VIAaaS-master-SNAPSHOT-all.jar" STOPSIGNAL SIGTERM diff --git a/root/scripts/parse-vb-config.sh b/root/scripts/parse-vb-config.sh index 2a29316..53248cc 100755 --- a/root/scripts/parse-vb-config.sh +++ b/root/scripts/parse-vb-config.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh -CONFIG_DIR=/app/config -CONFIG_FILE=${CONFIG_DIR}/viabackwards.yml +CONFIG_DIR=/app/config/viabackwards +CONFIG_FILE=${CONFIG_DIR}/config.yml { if [ -f ${CONFIG_FILE} ]; then