From 6deb61a20e521cad53fc9cc65dc6c10bc98c9f6a Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Mon, 15 Jul 2024 17:24:05 -0400 Subject: [PATCH] android/docker: combine CMD invocations into a single line (#448) android/docker: combine CMD into a single line updates tailscale/corp#21644 docker ignores all but the last CMD invocation. These have to be combined into a single line. The clean is redundant. We run a clean on the mounted directory before we kick off make docker-run-build. Signed-off-by: Jonathan Nobels --- Makefile | 2 +- docker/DockerFile.amd64-build | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 998587d..d0b4025 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # The docker image to use for the build environment. Changing this # will force a rebuild of the docker image. If there is an existing image # with this name, it will be used. -DOCKER_IMAGE=tailscale-android-build-amd64-2 +DOCKER_IMAGE=tailscale-android-build-amd64 DEBUG_APK=tailscale-debug.apk RELEASE_AAB=tailscale-release.aab diff --git a/docker/DockerFile.amd64-build b/docker/DockerFile.amd64-build index 7abe6e1..09f51e5 100644 --- a/docker/DockerFile.amd64-build +++ b/docker/DockerFile.amd64-build @@ -41,11 +41,6 @@ COPY android/gradlew android/gradlew COPY android/gradle android/gradle RUN ./android/gradlew -# Build the android app -CMD make clean -CMD make release -# Build the android tv app. We need to bump the version code by 1 -# so the AAB is unique. -CMD make bump_version_code -CMD make release-tv +# Build the android app, bump the playstore version code, and make the tv release +CMD make release && make bump_version_code && make release-tv