Merge branch 'master' into nested-nav-links

hosting/couchdb/Dockerfile.v2

@@ -96,6 +96,8 @@ EXPOSE 5984 4369 9100
 CMD ["/opt/couchdb/bin/couchdb"]
 
 FROM base as runner
+ARG TARGETARCH
+ENV TARGETARCH $TARGETARCH
 
 ENV COUCHDB_USER admin
 ENV COUCHDB_PASSWORD admin
@@ -126,8 +128,10 @@ ADD clouseau/log4j.properties clouseau/clouseau.ini ./
 WORKDIR /opt/couchdb
 ADD couch/vm.args couch/local.ini ./etc/
 
+# setup SQS
 WORKDIR /opt/sqs
-ADD sqs/sqs sqs/better_sqlite3.node ./
+ADD sqs ./
+RUN chmod +x ./install.sh && ./install.sh
 
 WORKDIR /
 ADD runner.v2.sh ./bbcouch-runner.sh

hosting/couchdb/sqs/install.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"
+if [[ $TARGETARCH == arm* ]] ;
+then
+  echo "Installing ARM SQS Client..."
+  mv $SCRIPT_DIR/arm/* .
+  rm -r $SCRIPT_DIR/arm
+  rm -r $SCRIPT_DIR/x86
+else
+  echo "Installing x86-64 SQS Client..."
+  mv $SCRIPT_DIR/x86/* .
+  rm -r $SCRIPT_DIR/arm
+  rm -r $SCRIPT_DIR/x86
+fi