Skip to content

Commit 5a264d7

Browse files
Merge pull request #269 from SwissBitcoinPay/fix-dockerfile-build
Fixes Dockerfile build
2 parents 3634212 + 2bd1328 commit 5a264d7

7 files changed

Lines changed: 272 additions & 39 deletions

File tree

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
APP_VERSION=2.5.5
1+
APP_VERSION=2.5.6
22

3-
APP_BUILD_NUMBER=432
3+
APP_BUILD_NUMBER=433

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Generates a release APK by running:
22
#
3-
# docker build -t sbp-builder . -o sbp-output
3+
# docker build . -o sbp-output
4+
#
5+
# If command fails (because of containerized environment), export the app as Tar archive :
6+
# docker build . --output type=tar,dest=sbp-output.tar
47
#
58

69
ARG SBP_CHECKOUT_UPLOAD_STORE_FILE=sbp.keystore

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def reactNativeArchitectures() {
9292
return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
9393
}
9494

95-
apply from: new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute().text.trim(), "../sentry.gradle")
95+
apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
9696
android {
9797
ndkVersion rootProject.ext.ndkVersion
9898

android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ buildscript {
1919
classpath("com.android.tools.build:gradle")
2020
classpath("com.facebook.react:react-native-gradle-plugin")
2121
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
22+
classpath("io.sentry:sentry-android-gradle-plugin:5.7.0")
2223
}
2324
}
2425

package-lock.json

Lines changed: 262 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@react-native/assets-registry": "0.77.1",
4141
"@react-spring/native": "9.7.5",
4242
"@react-spring/web": "9.7.5",
43-
"@sentry/react-native": "6.7.0",
43+
"@sentry/react-native": "6.15.1",
4444
"@sentry/webpack-plugin": "3.1.2",
4545
"@yudiel/react-qr-scanner": "2.1.0",
4646
"axios": "1.7.9",
@@ -207,4 +207,4 @@
207207
"webpack-cli": "6.0.1",
208208
"webpack-dev-server": "5.2.0"
209209
}
210-
}
210+
}

patches/react-native-vision-camera+4.6.3.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)