diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..f4b17147 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,28 @@ +# OS-Specific junk. +.DS_Store +Thumbs.db + +# IntelliJ +.idea +*.iml +*.ipr +*.iws + +# Xcode IDE +xcuserdata/ +DerivedData/ + +# Generated +/platform-darwin/Resources/Media/Images.xcassets/ +/platform-darwin/Podfile.lock +/platform-darwin/Pods/ + +# Gradle +build +.gradle +local.properties +/gradle/builds +/platform-android/.externalNativeBuild + +# Git +.git diff --git a/Dockerfile b/Dockerfile index 22c7bf34..6fda43bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,9 @@ FROM alpine +# For i386 +#FROM i386/alpine +#ENTRYPOINT ["linux32", "--"] + RUN apk add --no-cache git libtool automake autoconf make g++ bash openjdk8 RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules https://gitlab.com/MasterPassword/MasterPassword.git /mpw RUN cd /mpw/gradle && ./gradlew -i clean build diff --git a/lib/bin/build_lib b/lib/bin/build_lib index 9ce6c288..6bc493d6 100755 --- a/lib/bin/build_lib +++ b/lib/bin/build_lib @@ -119,7 +119,7 @@ _prepare_config() { if [[ $platform = windows ]]; then : else - autoreconf --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /') + autoreconf --verbose --install --force 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /') fi touch "$prefix/out/.prepared" diff --git a/platform-independent/c/core/lib/linux/x86/libmpw.so b/platform-independent/c/core/lib/linux/x86/libmpw.so new file mode 100755 index 00000000..23e081c4 Binary files /dev/null and b/platform-independent/c/core/lib/linux/x86/libmpw.so differ