blueprints.git

commit f53a254adb563f1f333f8533b237c58a3380c525

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

fix OSMDashboard

images names must be lowercase

fix paths

  | 0 
 OSMDashboard/build.sh | 15 ---------------
 osmdashboard/build.sh | 15 +++++++++++++++


diff --git a/OSMDashboard/Dockerfile b/OSMDashboard/Dockerfile
deleted file mode 100644
index ab0ea0275c9caf9c5d17c084eacc0f6e955cf8aa..0000000000000000000000000000000000000000
--- a/OSMDashboard/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM mobiledevops/android-sdk-image
-USER root
-WORKDIR /root
-RUN mkdir .ssh
-COPY ssh_key .ssh/id_ed25519
-COPY known_hosts .ssh/known_hosts
-COPY android.jks android.jks
-COPY keystore_pass keystore_pass
-COPY key_pass key_pass
-COPY build.sh build.sh
-RUN chmod 755 build.sh
-RUN chmod -R a+rX /root/android.jks
-RUN chmod -R a+rX /root/keystore_pass
-RUN chmod -R a+rX /root/key_pass
-ENTRYPOINT ["./build.sh"]




diff --git a/OSMDashboard/build.sh b/OSMDashboard/build.sh
deleted file mode 100755
index 9ff72372b9333499e0e5ac70f6b6a58b93bfbc04..0000000000000000000000000000000000000000
--- a/OSMDashboard/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-item="$1"
-
-git clone --branch apiote --single-branch --depth 1 https://git.apiote.xyz/git/OSMDashboard.git
-cd OSMDashboard
-# TODO tag on this commit, else commit hash
-commit=$(git show --pretty=oneline --abbrev-commit --name-only | head -n1 | cut -d ' ' -f 1)
-./gradlew assembleOfflineRelease
-buildTools=$(ls /opt/android-sdk-linux/build-tools | sort -V | tail -n1)
-mv build/outputs/apk/offline/release/*.apk build/outputs/apk/offline/release/app-offline-release-unsigned.apk
-"/opt/android-sdk-linux/build-tools/$buildTools/apksigner" sign --ks "/root/android.jks" --ks-pass "file:/root/keystore_pass" --ks-key-alias osmdashboard --key-pass "file:/root/key_pass" --in app/build/outputs/apk/offline/release/app-offline-release-unsigned.apk --out app/build/outputs/apk/standard/release/app-offline-release-signed.apk
-scp app/build/outputs/apk/standard/release/app-offline-release-signed.apk "deploy@host.containers.internal:toys/OSMDashboard/${item}/OSMDashboard-${commit}_arm64-v8a.apk"




diff --git a/osmdashboard/Dockerfile b/osmdashboard/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..ab0ea0275c9caf9c5d17c084eacc0f6e955cf8aa
--- /dev/null
+++ b/osmdashboard/Dockerfile
@@ -0,0 +1,15 @@
+FROM mobiledevops/android-sdk-image
+USER root
+WORKDIR /root
+RUN mkdir .ssh
+COPY ssh_key .ssh/id_ed25519
+COPY known_hosts .ssh/known_hosts
+COPY android.jks android.jks
+COPY keystore_pass keystore_pass
+COPY key_pass key_pass
+COPY build.sh build.sh
+RUN chmod 755 build.sh
+RUN chmod -R a+rX /root/android.jks
+RUN chmod -R a+rX /root/keystore_pass
+RUN chmod -R a+rX /root/key_pass
+ENTRYPOINT ["./build.sh"]




diff --git a/osmdashboard/build.sh b/osmdashboard/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..738b5a4756db95dc554cbb4dc26d2c64d0e4cb64
--- /dev/null
+++ b/osmdashboard/build.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -ex
+
+item="$1"
+
+git clone --branch apiote --single-branch --depth 1 https://git.apiote.xyz/git/OSMDashboard.git
+cd OSMDashboard
+# TODO tag on this commit, else commit hash
+commit=$(git show --pretty=oneline --abbrev-commit --name-only | head -n1 | cut -d ' ' -f 1)
+./gradlew assembleOfflineRelease
+buildTools=$(ls /opt/android-sdk-linux/build-tools | sort -V | tail -n1)
+mv build/outputs/apk/offline/release/*.apk build/outputs/apk/offline/release/app-offline-release-unsigned.apk
+"/opt/android-sdk-linux/build-tools/$buildTools/apksigner" sign --ks "/root/android.jks" --ks-pass "file:/root/keystore_pass" --ks-key-alias osmdashboard --key-pass "file:/root/key_pass" --in build/outputs/apk/offline/release/app-offline-release-unsigned.apk --out build/outputs/apk/offline/release/app-offline-release-signed.apk
+scp build/outputs/apk/offline/release/app-offline-release-signed.apk "deploy@host.containers.internal:toys/osmdashboard/${item}/OSMDashboard-${commit}_arm64-v8a.apk"