From 145ac9519a6df268f16346531c172ae46ede2416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 21 Jun 2024 16:59:34 +0200 Subject: [PATCH] fix: docker build deprecation warnings With the latest Docker upgrade, we got the following warnings during build: FromAsCasing: 'as' and 'FROM' keywords' casing do not match LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format --- changelog.d/20240621_170044_regis.md | 1 + tutorandroid/templates/android/build/Dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 changelog.d/20240621_170044_regis.md diff --git a/changelog.d/20240621_170044_regis.md b/changelog.d/20240621_170044_regis.md new file mode 100644 index 0000000..d7d2eb7 --- /dev/null +++ b/changelog.d/20240621_170044_regis.md @@ -0,0 +1 @@ +- [Bugfix] Fix legacy warnings during Docker build. (by @regisb) diff --git a/tutorandroid/templates/android/build/Dockerfile b/tutorandroid/templates/android/build/Dockerfile index b2bd950..8a8867a 100644 --- a/tutorandroid/templates/android/build/Dockerfile +++ b/tutorandroid/templates/android/build/Dockerfile @@ -16,9 +16,9 @@ FROM base AS sdk # Install Android SDK # Inspired from https://github.com/LiveXP/docker-android-sdk/blob/master/Dockerfile # Get sdk version from here: https://developer.android.com/studio#command-tools -ENV ANDROID_SDK_VERSION 11076708 -ENV ANDROID_SDK_PATH /app/android-sdk -ENV ANDROID_HOME /app/android-sdk +ENV ANDROID_SDK_VERSION=11076708 +ENV ANDROID_SDK_PATH=/app/android-sdk +ENV ANDROID_HOME=/app/android-sdk RUN mkdir ${ANDROID_HOME} WORKDIR /app/android-sdk RUN wget --quiet https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip && \ @@ -53,7 +53,7 @@ RUN ./gradlew -v RUN ./gradlew tasks ###### Build image with app-specific settings -FROM common as build +FROM common AS build # User-customized config COPY ./config/tutor.yaml ./default_config/dev/config.yaml @@ -72,6 +72,6 @@ RUN ./gradlew assembleProd{{ "Release" if ANDROID_ENABLE_RELEASE_MODE else "Debu #### File server to serve apk file # https://hub.docker.com/_/caddy?tab=tags -FROM docker.io/caddy:2.6.4-alpine as production +FROM docker.io/caddy:2.6.4-alpine AS production COPY --from=build /app/openedx-app-android/app/build/outputs/apk/prod/{{ "release" if ANDROID_ENABLE_RELEASE_MODE else "debug" }}/app-prod-{{ "release" if ANDROID_ENABLE_RELEASE_MODE else "debug" }}.apk /srv/app.apk CMD caddy file-server --listen=:8000 --root=/srv