From e79058d8797c918d37e406245ca7683cf07240d1 Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 23 Apr 2017 16:39:03 -0400 Subject: [ag] Fix native build step with revised dockerfile * PROBLEM: * most recent version (r14b) of `android-ndk` uses `clang` for cross-compilation * BUT: `openssl` cannot compile successfully w/ `clang` * AND: we depend on `openssl` transitively through `ics-openvpn` while trying to use `android-ndk` r14b * FIX: * downgrade to `android-ndk` (12b) (most recent versoin that still uses `gcc` instead of `clang`) * modify some of the default * REMAINING PROBLEMS: * some string translations for Jamaica now break the build (unclear why -- outdated country abbreviation? ja for jm???) * we are now using a version of ndk that is 2 versions old and a version of ics-openvpn (pinned to a 3.1.2016 commit via submodule) that depends on an outdated version of `openssl`, which raises security concerns. updating to the most recent version will force us to wade into all the dependency problems amongst `ics-openvpn`/`openssl`/`ndk` * REFERENCES: * on `openssl` incompatibility w/ clang: https://github.com/openssl/openssl/pull/2229 * on `ics-openvpn` problems with `ndk`: https://github.com/android-ndk/ndk/issues/144 --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ad57573..920f65d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,12 @@ +# NOTE(@aguestuser|4.23.17): +# - we would prefer 0xacab.org:4567/leap/bitmask_android:android-sdk +# as the build image, but cant do that presently b/c: +# (1) i do not have permissions to create docker repositories in this repo +# (2) we need to add whatever image we use to gitlab ci's whitelist +# or else we get a message like: +# `ERROR: The 0xacab.org:4567/aguestuser/bitmask_android:android-sdk-25 is not present on list of allowed images` + image: "0xacab.org:4567/leap/gitlab-buildpackage:android" -#image: "gfx2015/android" stages: - build -- cgit v1.2.3 From 7ed7d62015fafe5b9a11097c04419d2ffd0826c1 Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 23 Apr 2017 20:58:42 -0400 Subject: [ag] use self-contained docker registry in ci build * for greater compartmentalization and self-documentation, use docker registry in this repo to host image used in its build rather than registry in `leap/gitlab-buildpackage` as before --- .gitlab-ci.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 920f65d0..5321f64d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,4 @@ -# NOTE(@aguestuser|4.23.17): -# - we would prefer 0xacab.org:4567/leap/bitmask_android:android-sdk -# as the build image, but cant do that presently b/c: -# (1) i do not have permissions to create docker repositories in this repo -# (2) we need to add whatever image we use to gitlab ci's whitelist -# or else we get a message like: -# `ERROR: The 0xacab.org:4567/aguestuser/bitmask_android:android-sdk-25 is not present on list of allowed images` - -image: "0xacab.org:4567/leap/gitlab-buildpackage:android" +image: "0xacab.org:4567/leap/bitmask_android/android-sdk:latest" stages: - build -- cgit v1.2.3 From 9278f4680d9fdd34803089be875d16d667c0579e Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 23 Apr 2017 21:32:48 -0400 Subject: [ag] use canonical format for 0xacab docker registry images * this change was necessitated by prior format failing a whitelisted images check here: https://0xacab.org/aguestuser/bitmask_android/builds/9406 * NOTE: this format means we can't label `android-sdk` images by version because the tag is reserved for the image name, not the version :( * ie: the whitelist forces us to specify `bimtask_android:android-sdk` rather than `bitmask_android/android-sdk:0.0.1` -- is there a reason for this? --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5321f64d..8bbe684b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "0xacab.org:4567/leap/bitmask_android/android-sdk:latest" +image: "0xacab.org:4567/leap/bitmask_android:android-sdk" stages: - build -- cgit v1.2.3 From d1594edf30c4d6f171682b527ebffbb489d6481b Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 23 Apr 2017 23:29:01 -0400 Subject: [ag] use external docker registry to demonstrate state of build --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bbe684b..7d2875ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ -image: "0xacab.org:4567/leap/bitmask_android:android-sdk" +#image: "0xacab.org:4567/leap/bitmask_android:android-sdk" +image: "0xacab.org:4567/leap/gitlab-buildpackage:android" stages: - build -- cgit v1.2.3 From 1e8da8edc94a552511e740f9d6a52a0d522432aa Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 30 Apr 2017 17:12:59 -0400 Subject: [ag] use ndk container from repo registry in build --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d2875ac..6f8f92c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,4 @@ -#image: "0xacab.org:4567/leap/bitmask_android:android-sdk" -image: "0xacab.org:4567/leap/gitlab-buildpackage:android" +image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" stages: - build -- cgit v1.2.3