blueprints.git

commit 5e6e2f75fa8dc682c54fcfad921722c69a6118b3

Author: Adam Evyčędo <git@apiote.xyz>

czwek release blueprint

 czwek/Dockerfile | 11 ++++++++++-
 czwek/build.sh | 4 ++--


diff --git a/czwek/Dockerfile b/czwek/Dockerfile
index ab0ea0275c9caf9c5d17c084eacc0f6e955cf8aa..ac09d62d89ba8c42ae51efb801221cc1157a1672 100644
--- a/czwek/Dockerfile
+++ b/czwek/Dockerfile
@@ -1,5 +1,14 @@
-FROM mobiledevops/android-sdk-image
+FROM eclipse-temurin:17.0.7_7-jdk
+RUN apt update
+RUN apt install -y git unzip
 USER root
+RUN mkdir sdk
+WORKDIR sdk
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
+RUN unzip commandlinetools-linux-9477386_latest.zip
+RUN rm commandlinetools-linux-9477386_latest.zip
+RUN echo y | cmdline-tools/bin/sdkmanager --sdk_root=/root/sdk/ 'build-tools;33.0.2'
+ENV ANDROID_HOME=/root/sdk
 WORKDIR /root
 RUN mkdir .ssh
 COPY ssh_key .ssh/id_ed25519




diff --git a/czwek/build.sh b/czwek/build.sh
index b5eecd88e967ad79cfb7e64fc890eac381636df0..3901341c918837e5e3d27e1bc26070668d728aff 100755
--- a/czwek/build.sh
+++ b/czwek/build.sh
@@ -9,8 +9,8 @@ cd Bimba
 tag=$(git tag | sort -V | tail -n1)
 git switch -d "$tag"
 ./gradlew assembleRelease
-buildTools=$(ls /opt/android-sdk-linux/build-tools | sort -V | tail -n1)
-"/opt/android-sdk-linux/build-tools/$buildTools/apksigner" sign --ks "/root/android.jks" --ks-pass "file:/root/keystore_pass" --ks-key-alias bimba2 --key-pass "file:/root/key_pass" --in app/build/outputs/apk/release/app-release-unsigned.apk --out app/build/outputs/apk/release/app-release-signed.apk
+buildTools=$(ls /root/sdk/build-tools | sort -V | tail -n1)
+"/root/build-tools/$buildTools/apksigner" sign --ks "/root/android.jks" --ks-pass "file:/root/keystore_pass" --ks-key-alias bimba2 --key-pass "file:/root/key_pass" --in app/build/outputs/apk/release/app-release-unsigned.apk --out app/build/outputs/apk/release/app-release-signed.apk
 scp app/build/outputs/apk/release/app-release-signed.apk "deploy@host.containers.internal:toys/czwek/${item}/Bimba-${tag}.apk"
 scp app/build/outputs/apk/release/app-release-signed.apk "deploy@host.containers.internal:/srv/www/artifacts/bimba/Bimba-${tag}.apk"
 ssh deploy@host.containers.internal "doas /usr/local/bin/srv_perms"