From 3951a57671af131cfb2281789f8ffc3e030d9dbb Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Thu, 16 Dec 2021 15:06:35 -0600
Subject: [PATCH] Upgrade to RenPy 7.4.11

---
 Dockerfile         | 55 +++++++++++++++++++++++-----------------------
 tag                |  2 +-
 upload_pipeline.sh |  0
 3 files changed, 29 insertions(+), 28 deletions(-)
 mode change 100644 => 100755 upload_pipeline.sh

diff --git a/Dockerfile b/Dockerfile
index 263e997..21cf6d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,19 +2,6 @@ FROM python:3-slim
 
 LABEL maintainer="Drew Short <warrick@sothr.com>"
 
-ARG RENPY_VERSION
-ENV SDL_AUDIODRIVER="dummy" \
-    SDL_VIDEODRIVER="dummy" \
-    RENPY_DIR="/renpy" \
-    RENPY_VERSION=${RENPY_VERSION:-"7.3.5"} \
-    JDK_VERSION=${JDK_VERSION:-"8u242"} \
-    JDK_BUILD=${JDK_BUILD:-"b08"} \
-    JAVA_HOME=${JAVA_HOME:-/opt/java} \
-    ANDROID_SDK_VERSION=${ANDROID_SDK_VERSION:-"sdk-tools-linux-4333796"} \
-    ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT:-"/renpy/rapt/Sdk"} \
-    ANDROID_HOME=${ANDROID_SDK_ROOT} \
-    PATH="$PATH:${JAVA_HOME:-/opt/java}/bin"
-
 # Temp directory and volume mount
 RUN mkdir -p /tmp /project
 
@@ -23,30 +10,38 @@ VOLUME /project
 
 # Install required tooling
 RUN apt-get -y update \
-    && apt-get -y --no-install-recommends install \
-        bzip2 \
-        ca-certificates \
-        curl \
-	faketime \
-        ffmpeg \
-        jq \
-        opus-tools \
-        parallel \
-        procps \
-        tar \
-        unzip \
-        wget \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+         bzip2 \
+         ca-certificates \
+         curl \
+         faketime \
+         ffmpeg \
+         jq \
+         opus-tools \
+         procps \
+         tar \
+         unzip \
+         wget \
     && rm -Rf /var/lib/apt/lists/*
 
+# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases
 # Install Java 8
+ENV JDK_VERSION=${JDK_VERSION:-"8u292"} \
+    JDK_BUILD=${JDK_BUILD:-"b10"} \
+    JDK_VM_NAME=${JDK_VM_NAME:-"openj9"} \
+    JDK_VM_VERSION=${JDK_VM_VERSION:-"0.26.0"} \
+    JAVA_HOME=${JAVA_HOME:-/opt/java}
 RUN cd /tmp \
-    && curl -LSo jdk${JDK_VERSION}-${JDK_BUILD}.tgz https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk${JDK_VERSION}-${JDK_BUILD}/OpenJDK8U-jdk_x64_linux_hotspot_${JDK_VERSION}${JDK_BUILD}.tar.gz \
+    && curl -LSo jdk${JDK_VERSION}-${JDK_BUILD}.tgz https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk${JDK_VERSION}-${JDK_BUILD}_${JDK_VM_NAME}-${JDK_VM_VERSION}/OpenJDK8U-jdk_x64_linux_${JDK_VM_NAME}_${JDK_VERSION}${JDK_BUILD}_${JDK_VM_NAME}-${JDK_VM_VERSION}.tar.gz \
     && tar -zxf jdk${JDK_VERSION}-${JDK_BUILD}.tgz \
     && mkdir -p ${JAVA_HOME} \
     && mv ./jdk${JDK_VERSION}-${JDK_BUILD}/* "${JAVA_HOME}" \
     && rm -rf "jdk${JDK_VERSION}-${JDK_BUILD}" "${JDK_VERSION}-${JDK_BUILD}.tgz"
 
 # Install RenPy
+ARG RENPY_VERSION
+ENV RENPY_DIR="/renpy" \
+    RENPY_VERSION=${RENPY_VERSION:-"7.4.11"}
 RUN cd /tmp \
     && curl -LSo renpy-${RENPY_VERSION}-sdk.tar.bz2 https://www.renpy.org/dl/${RENPY_VERSION}/renpy-${RENPY_VERSION}-sdk.tar.bz2 \
     && curl -LSo renpy-${RENPY_VERSION}-rapt.zip https://www.renpy.org/dl/${RENPY_VERSION}/renpy-${RENPY_VERSION}-rapt.zip \
@@ -65,6 +60,9 @@ RUN printf "key.alias=android\nkey.store.password=android\nkey.alias.password=an
     && cp ${RENPY_DIR}/rapt/prototype/local.properties ${RENPY_DIR}/rapt/project/local.properties
 
 # Install the Android SDK for rapt
+ENV ANDROID_SDK_VERSION=${ANDROID_SDK_VERSION:-"sdk-tools-linux-4333796"} \
+    ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT:-"/renpy/rapt/Sdk"} \
+    ANDROID_HOME=${ANDROID_SDK_ROOT}
 RUN cd /tmp \
     && curl -LSo ${ANDROID_SDK_VERSION}.zip https://dl.google.com/android/repository/${ANDROID_SDK_VERSION}.zip \
     && unzip ${ANDROID_SDK_VERSION}.zip -d ./${ANDROID_SDK_VERSION} \
@@ -82,4 +80,7 @@ RUN cd ${ANDROID_SDK_ROOT} \
 RUN cd ${RENPY_DIR}/rapt/prototype \
     && ./gradlew --version
 
+ENV PATH="$PATH:${JAVA_HOME:-/opt/java}/bin" \
+    SDL_AUDIODRIVER="dummy" \
+    SDL_VIDEODRIVER="dummy"
 WORKDIR $RENPY_DIR
diff --git a/tag b/tag
index d9edd15..cd32dca 100644
--- a/tag
+++ b/tag
@@ -1 +1 @@
-7.3.5
+7.4.11
diff --git a/upload_pipeline.sh b/upload_pipeline.sh
old mode 100644
new mode 100755