This commit is contained in:
STAM 2023-07-01 16:07:10 +03:00
parent 1253f78d2c
commit 5dda891716
Signed by: stam
GPG Key ID: 4F57E51F9C45F8CD
3 changed files with 8 additions and 8 deletions

View File

@ -5,21 +5,21 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV ANDROID_HOME=/usr/lib/android-sdk ENV ANDROID_HOME=/usr/lib/android-sdk
ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk
ENV GRADLE_VERSION=7.4.2 ENV GRADLE_VERSION=8.2
ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip
ENV GRADLE_ROOT=/opt/gradle ENV GRADLE_ROOT=/opt/gradle
ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION} ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION}
ENV GRADLE_BIN=$GRADLE_PATH/bin ENV GRADLE_BIN=$GRADLE_PATH/bin
ARG GRADLE_TEMP=/tmp/gradle.zip ARG GRADLE_TEMP=/tmp/gradle.zip
ENV KTC_VERSION=1.6.21 ENV KTC_VERSION=1.8.22
ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip
ARG KTC_TEMP=/tmp/kotlinc.tgz ARG KTC_TEMP=/tmp/kotlinc.tgz
ENV KTC_ROOT=/opt/kotlin ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=PATH=$PATH:$GRADLE_BIN:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
################################################################## ##################################################################
# Android SDK # Android SDK
@ -51,7 +51,7 @@ RUN mkdir -p ${KTC_PATH}
RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP} RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP}
RUN 7zz x $KTC_TEMP -o$KTC_ROOT RUN 7zz x $KTC_TEMP -o$KTC_ROOT
RUN chmod +x -R ${KTC_BIN} RUN chmod +x -R ${KTC_BIN}
RUN kotlinc -version RUN kotlin -version
################################################################## ##################################################################
# cleaninig up # cleaninig up

View File

@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=PATH=$PATH:$GRADLE_BIN:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
################################################################## ##################################################################
# Android SDK # Android SDK
@ -51,7 +51,7 @@ RUN mkdir -p ${KTC_PATH}
RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP} RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP}
RUN 7zz x $KTC_TEMP -o$KTC_ROOT RUN 7zz x $KTC_TEMP -o$KTC_ROOT
RUN chmod +x -R ${KTC_BIN} RUN chmod +x -R ${KTC_BIN}
RUN kotlinc -version RUN kotlin -version
################################################################## ##################################################################
# cleaninig up # cleaninig up

View File

@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
ENV KTC_PATH=${KTC_ROOT}/kotlinc ENV KTC_PATH=${KTC_ROOT}/kotlinc
ENV KTC_BIN=$KTC_PATH/bin ENV KTC_BIN=$KTC_PATH/bin
ENV PATH=PATH=$PATH:$GRADLE_BIN:${KTC_BIN} ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
################################################################## ##################################################################
# Android SDK # Android SDK
@ -51,7 +51,7 @@ RUN mkdir -p ${KTC_PATH}
RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP} RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP}
RUN 7zz x $KTC_TEMP -o$KTC_ROOT RUN 7zz x $KTC_TEMP -o$KTC_ROOT
RUN chmod +x -R ${KTC_BIN} RUN chmod +x -R ${KTC_BIN}
RUN kotlinc -version RUN kotlin -version
################################################################## ##################################################################
# cleaninig up # cleaninig up