aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorezkrg <ezkrg@ezkrg.me>2022-04-05 13:44:17 +0000
committerezkrg <ezkrg@ezkrg.me>2022-04-05 13:44:17 +0000
commit3e7af7045b6e822df85699ecda03963c10b95746 (patch)
tree4bdd99a72dae2a1093325bad25faea25a053e33d
parentuse latest dind (diff)
downloaddocker-bitlbee-libpurple-3e7af7045b6e822df85699ecda03963c10b95746.tar.gz
docker-bitlbee-libpurple-3e7af7045b6e822df85699ecda03963c10b95746.zip
let arm build in debian based image
-rw-r--r--.drone.yml2
-rw-r--r--matrix-e2e.c.patch20
2 files changed, 20 insertions, 2 deletions
diff --git a/.drone.yml b/.drone.yml
index f61c2f1..3a5c21c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,7 +20,6 @@ steps:
DOCKER_HOST: tcp://docker:2375
commands:
- while ! docker info; do sleep 1; done
- - docker run --rm --privileged tonistiigi/binfmt --install all
- docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST
- echo $PASSWORD | docker login --username $USER --password-stdin
- docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:test --platform linux/amd64 .
@@ -38,7 +37,6 @@ steps:
DOCKER_HOST: tcp://docker:2375
commands:
- while ! docker info; do sleep 1; done
- - docker run --rm --privileged tonistiigi/binfmt --install all
- docker buildx create --use --name docker --node docker --platform linux/amd64--driver docker-container $DOCKER_HOST
- echo $PASSWORD | docker login --username $USER --password-stdin
- docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:$DRONE_TAG -t ezkrg/bitlbee-libpurple:latest --platform linux/amd64 .
diff --git a/matrix-e2e.c.patch b/matrix-e2e.c.patch
new file mode 100644
index 0000000..8dd7c47
--- /dev/null
+++ b/matrix-e2e.c.patch
@@ -0,0 +1,20 @@
+--- matrix-e2e.c
++++ matrix-e2e.c.new
+@@ -949,7 +949,7 @@
+ to_create = (max_keys / 2) - count;
+ need_to_send = TRUE;
+ }
+- purple_debug_info("matrixprpl", "%s: %s: %ld\n",
++ purple_debug_info("matrixprpl", "%s: %s: %lld\n",
+ __func__, key_algo, count);
+ }
+ }
+@@ -1520,7 +1520,7 @@
+ plaintext[pt_len] = '\0';
+ handle_decrypted_olm(pc, conn, cevent_sender, sender_key, plaintext);
+ } else {
+- purple_debug_info("matrixprpl", "%s: Type %zd olm\n", __func__, type);
++ purple_debug_info("matrixprpl", "%s: Type %lld olm\n", __func__, type);
+ }
+ if (plaintext) {
+ clear_mem(plaintext, max_plaintext_len); \ No newline at end of file