diff --git a/.dockerignore b/.dockerignore --- a/.dockerignore +++ b/.dockerignore @@ -15,6 +15,7 @@ native !native/package.json !native/.flowconfig +!native/postinstall.sh !native/ios/Podfile !native/ios/pod-patch !native/cpp/CommonCpp/grpc diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile --- a/keyserver/Dockerfile +++ b/keyserver/Dockerfile @@ -105,7 +105,7 @@ COPY --chown=comm keyserver/package.json keyserver/.flowconfig keyserver/ COPY --chown=comm lib/package.json lib/.flowconfig lib/ COPY --chown=comm web/package.json web/.flowconfig web/ -COPY --chown=comm native/package.json native/.flowconfig native/ +COPY --chown=comm native/package.json native/.flowconfig native/postinstall.sh native/ COPY --chown=comm landing/package.json landing/.flowconfig landing/ COPY --chown=comm desktop/package.json desktop/ COPY --chown=comm keyserver/addons/opaque-ke-napi/package.json \ diff --git a/native/package.json b/native/package.json --- a/native/package.json +++ b/native/package.json @@ -10,7 +10,7 @@ "clean-android": "rm -rf android/build android/app/build android/app/.cxx", "clean-ios": "rm -rf ios/Pods/", "clean-all": "yarn clean && rm -rf ~/Library/Developer/Xcode/DerivedData/Comm-*; cd android && (./gradlew clean || true)", - "postinstall": "cd ../ && echo '{\"name\": \"olm\", \"version\": \"3.2.4\"}' > ./node_modules/olm/package.json && yarn patch-package && yarn flow-mono create-symlinks native && cd native && yarn jetify && ((cd ios && PATH=/usr/bin:\"$PATH\" pod install) || true)", + "postinstall": "bash ./postinstall.sh", "start": "yarn expo start --dev-client", "dev": "yarn start", "test": "yarn jest", diff --git a/native/postinstall.sh b/native/postinstall.sh new file mode 100644 --- /dev/null +++ b/native/postinstall.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +# Skip Windows +if [[ "$OSTYPE" == "msys" ]]; then + exit 0 +fi + +cd ../ +echo '{"name": "olm", "version": "3.2.4"}' > ./node_modules/olm/package.json +yarn patch-package +yarn flow-mono create-symlinks native + +cd native +yarn jetify + +if [[ "$OSTYPE" == "darwin"* ]]; then + (cd ios && PATH=/usr/bin:"$PATH" pod install) +fi