Upgrade Docker image to openjdk 21

rovellipaolo · Feb 23, 2024 · 18a6db5 · 18a6db5
1 parent 2b57073
commit 18a6db5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 30 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-slim-buster
+FROM openjdk:21-slim-bookworm
 
 ENV NINJADROID_HOME=/opt/NinjaDroid
 ENV NINJADROID_USER=ninjadroid
@@ -35,7 +35,7 @@ COPY ninjadroid.py ${NINJADROID_HOME}
 COPY ninjadroid/ ${NINJADROID_HOME}/ninjadroid/
 
 #RUN pip3 install -r ${NINJADROID_HOME}/requirements/prod.txt \
-RUN pip3 install -r ${NINJADROID_HOME}/requirements.txt \
+RUN pip3 install -r ${NINJADROID_HOME}/requirements.txt --break-system-packages \
     && ln -s ${ANDROID_HOME}/build-tools/${ANDROID_SDK_BUILD_TOOLS_VERSION}/aapt ${NINJADROID_HOME}/ninjadroid/aapt/aapt \
     && chmod a+x ${NINJADROID_HOME}/ninjadroid/aapt/aapt \
     && chmod a+x ${NINJADROID_HOME}/ninjadroid/apktool/apktool.jar \

diff --git a/regression/docker.py b/regression/docker.py
@@ -39,8 +39,7 @@ def show_extended(self):
         expected = self.read_plain_text_file(
             "regression/expected/extended.txt",
             overrides={
-                0: "file:    /apks/Example.apk",
-                22: "signature: SHA1withRSA (weak)"
+                0: "file:    /apks/Example.apk"
             }
         )
 
@@ -63,13 +62,7 @@ def show_json_extended(self):
         expected = self.read_json_file(
             "regression/expected/extended.json",
             overrides={
-                "file": "/apks/Example.apk",
-                "cert": {
-                    "fingerprint": {
-                        "signature": "SHA1withRSA (weak)"
-                    }
-                },
-
+                "file": "/apks/Example.apk"
             }
         )
 
@@ -84,7 +77,7 @@ def extract_extended(self):
         expected = self.read_plain_text_file(
             "regression/expected/extract.txt",
             overrides={
-                18: "7ab36f88adf38f96df05c9e024d548ab  output/report-Example.json"
+                22: "7ab36f88adf38f96df05c9e024d548ab  output/report-Example.json"
             }
         )
 

diff --git a/regression/expected/extended.json b/regression/expected/extended.json
@@ -5,7 +5,7 @@
             "md5": "",
             "sha1": "5A:C0:6C:32:63:7F:5D:BE:CA:F9:38:38:4C:FA:FF:ED:20:52:43:B6",
             "sha256": "E5:15:CC:BC:5E:BF:B2:9D:A6:13:03:63:CF:19:33:FA:CE:AF:DC:ED:5D:2F:F5:98:7C:CE:37:13:64:4A:CF:77",
-            "signature": "SHA1withRSA",
+            "signature": "SHA1withRSA (weak)",
             "version": "3"
         },
         "issuer": {
@@ -314,4 +314,4 @@
     "sha256": "8773441a656b60c5e18481fd5ba9c1bf350d98789b975987cb3b2b57ee44ee51",
     "sha512": "559eab9840ff2f8507842605e60bb0730442ddf9ee7ca4ab4f386f715c1a4707766065d6f0b977816886692bf88b400643979e2fd13e6999358a21cabdfb3071",
     "size": 70058
-}
+}
diff --git a/regression/expected/extended.txt b/regression/expected/extended.txt
@@ -20,7 +20,7 @@ cert:
 		md5:   
 		sha1:  5A:C0:6C:32:63:7F:5D:BE:CA:F9:38:38:4C:FA:FF:ED:20:52:43:B6
 		sha256: E5:15:CC:BC:5E:BF:B2:9D:A6:13:03:63:CF:19:33:FA:CE:AF:DC:ED:5D:2F:F5:98:7C:CE:37:13:64:4A:CF:77
-		signature: SHA1withRSA
+		signature: SHA1withRSA (weak)
 		version: 3
 	owner:
 		name:  Name

diff --git a/regression/expected/extract.txt b/regression/expected/extract.txt
@@ -2,28 +2,28 @@ e74dbf28ebab4e1b7442a9c78067d1c2  output/res/drawable-hdpi-v4/ic_launcher_logo.p
 e74dbf28ebab4e1b7442a9c78067d1c2  output/res/drawable-hdpi-v4/ic_launcher.png
 94f5591633218c0b469b65947fd8943b  output/res/drawable-xhdpi-v4/ic_launcher_logo.png
 94f5591633218c0b469b65947fd8943b  output/res/drawable-xhdpi-v4/ic_launcher.png
-58b9a42eeb99fad5321208fe02f24375  output/res/drawable-ldpi-v4/ic_launcher_logo.png
-58b9a42eeb99fad5321208fe02f24375  output/res/drawable-ldpi-v4/ic_launcher.png
 dd7e82de510241b1c68544c1139e54a9  output/res/layout/main.xml
 acefc1f320111a8d71bcdb8b4aa0656c  output/res/drawable-mdpi-v4/ic_launcher_logo.png
 acefc1f320111a8d71bcdb8b4aa0656c  output/res/drawable-mdpi-v4/ic_launcher.png
-ab2b91021ecd5c766dc9a8f54b3ff925  output/res/values/public.xml
+58b9a42eeb99fad5321208fe02f24375  output/res/drawable-ldpi-v4/ic_launcher_logo.png
+58b9a42eeb99fad5321208fe02f24375  output/res/drawable-ldpi-v4/ic_launcher.png
 f8350dc778cf2b34616ca38920356a56  output/res/values/strings.xml
-6098a6409625f1c0d97cd33c13ad300c  output/original/META-INF/MANIFEST.MF
-fb02917b68510e413a06e52873802bcd  output/original/META-INF/CERT.SF
-860e19fa47d37d9510f1245c511a8578  output/original/META-INF/CERT.RSA
-1f97f7e7ca62f39f8f81d79b1b540c37  output/original/AndroidManifest.xml
-e7f9f1e9b8c4e37ff831c47ee85bcb9e  output/AndroidManifest.xml
+ab2b91021ecd5c766dc9a8f54b3ff925  output/res/values/public.xml
 7bc52ece5249ccd2d72c4360f9be2ca5  output/classes.dex
-8f28855815c722e48dce1e406573f124  output/apktool.yml
-6479d0295f183b10a9760990ee3d054a  output/report-Example.json
+2e9ee4a9c6e794f43ffc0906d13880d1  output/smali/com/example/app/ExampleBrodcastReceiver4.smali
 a97104d5fe42e4fec8a9ffd00129cfcb  output/smali/com/example/app/ExampleBrodcastReceiver2.smali
-2b5ee1d30a078b0f9d78ea97fa56ea46  output/smali/com/example/app/HomeActivity.smali
-c19fc8d7fd8629a09dcd57da86ebc926  output/smali/com/example/app/ExampleService3.smali
+3be1ecc609eb4842253005aed02710a8  output/smali/com/example/app/OtherActivity.smali
 29aeb44f31cc3151f41a5e3bf07ce8c2  output/smali/com/example/app/ExampleService2.smali
-ddddc2fded0c1b89198d637656d4fcc5  output/smali/com/example/app/ExampleService.smali
 12064c27303a9c5c041a4e4736b0dac8  output/smali/com/example/app/ExampleBrodcastReceiver3.smali
 be5881bd04517a3d1ab27cf5d77670cc  output/smali/com/example/app/ExampleBrodcastReceiver.smali
-3be1ecc609eb4842253005aed02710a8  output/smali/com/example/app/OtherActivity.smali
-2e9ee4a9c6e794f43ffc0906d13880d1  output/smali/com/example/app/ExampleBrodcastReceiver4.smali
+ddddc2fded0c1b89198d637656d4fcc5  output/smali/com/example/app/ExampleService.smali
+2b5ee1d30a078b0f9d78ea97fa56ea46  output/smali/com/example/app/HomeActivity.smali
+c19fc8d7fd8629a09dcd57da86ebc926  output/smali/com/example/app/ExampleService3.smali
 860e19fa47d37d9510f1245c511a8578  output/CERT.RSA
+25ada2132e42197adfaccd8293c8363a  output/report-Example.json
+8f28855815c722e48dce1e406573f124  output/apktool.yml
+e7f9f1e9b8c4e37ff831c47ee85bcb9e  output/AndroidManifest.xml
+860e19fa47d37d9510f1245c511a8578  output/original/META-INF/CERT.RSA
+6098a6409625f1c0d97cd33c13ad300c  output/original/META-INF/MANIFEST.MF
+fb02917b68510e413a06e52873802bcd  output/original/META-INF/CERT.SF
+1f97f7e7ca62f39f8f81d79b1b540c37  output/original/AndroidManifest.xml