Skip to content

Commit

Permalink
just revert to downloading from jitpack, idk
Browse files Browse the repository at this point in the history
originally changed to compile because jitpack 401'd me for some reason
  • Loading branch information
RoblKyogre committed Feb 25, 2024
1 parent 0eea014 commit 99a74c4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
23 changes: 12 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions root/scripts/parse-vb-config.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 99a74c4

Please sign in to comment.