update tor to 0.4.6.8, keyserver for sig verification and alpine to 3…

….13.6

Dockerfile.deps nits

Dockerfile.deps

@@ -37,13 +37,13 @@ RUN git clone --quiet --depth 1 --branch v22.0 --single-branch --recursive https
  && git checkout a0988140b71485ad12c3c3a4a9573f7c21b1eff8 \
  && git apply /${CORE_PATCH} \
  && (cd depends \
- && make HOST=x86_64-pc-linux-gnu NO_QT=1 -j $(grep ^processor /proc/cpuinfo | wc -l)) \
+ && make HOST=x86_64-pc-linux-gnu NO_QT=1 -j $(nproc --all)) \
  && ./autogen.sh \
  && CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure --prefix=/srv/explorer/bitcoin --disable-man --disable-zmq --disable-qt --disable-gui-tests --disable-bench \
                 --enable-experimental-asm --without-utils --enable-util-cli --without-libs --with-daemon --disable-maintainer-mode \
                 --disable-glibc-back-compat --disable-ccache --disable-dependency-tracking --disable-tests --with-gui=no \
- && make -j $(grep ^processor /proc/cpuinfo | wc -l) \
- && make install -j $(grep ^processor /proc/cpuinfo | wc -l) \
+ && make -j $(nproc --all) \
+ && make install -j $(nproc --all) \
  && strip /srv/explorer/bitcoin/bin/* \
  && rm -fr ${CORE_SRC} /${CORE_PATCH})
 
@@ -73,9 +73,9 @@ RUN source /root/.cargo/env \
  && git checkout 703c6a20d52b61a234a18812503bd754d448992a \
  && cp contrib/popular-scripts.txt /srv/explorer \
  && cargo install --root /srv/explorer/electrs_bitcoin --locked --path . --features electrum-discovery \
- && cargo install --root /srv/explorer/electrs_liquid --locked --path . --features electrum-discovery,liquid \
+ && cargo install --root /srv/explorer/electrs_liquid --locked --path . --features electrum-discovery,liquid) \
  && rm -fr /root/.cargo electrs \
- && strip /srv/explorer/electrs_*/bin/electrs)
+ && strip /srv/explorer/electrs_*/bin/electrs
 
 
 # cleanup

Dockerfile.tor

@@ -1,6 +1,6 @@
-FROM alpine@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d AS builder
+FROM alpine@sha256:e15947432b813e8ffa90165da919953e2ce850bef511a0ad1287d7cb86de84b5 AS builder
 
-ARG TOR_VER=0.4.2.6
+ARG TOR_VER=0.4.6.8
 ARG TORGZ=https://dist.torproject.org/tor-$TOR_VER.tar.gz
 
 RUN apk --no-cache add --update \
@@ -9,12 +9,12 @@ RUN apk --no-cache add --update \
 RUN wget $TORGZ.asc && wget $TORGZ
 
 # Verify tar signature and install tor
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0x6AFEE6D49E92B601 \
-  && gpg --verify tor-$TOR_VER.tar.gz.asc || { echo "Couldn't verify sig"; exit; }
+RUN gpg --keyserver keys.openpgp.org --recv-keys 0x6AFEE6D49E92B601 \
+  && gpg --verify tor-$TOR_VER.tar.gz.asc || { echo "Couldn't verify sig"; exit 1; }
 RUN tar xfz tor-$TOR_VER.tar.gz && cd tor-$TOR_VER \
-  && ./configure && make -j $(grep ^processor /proc/cpuinfo | wc -l) install
+  && ./configure && make -j $(nproc --all) install
 
-FROM alpine@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
+FROM alpine@sha256:e15947432b813e8ffa90165da919953e2ce850bef511a0ad1287d7cb86de84b5
 
 RUN apk --no-cache add --update \
   bash alpine-sdk gnupg libevent libevent-dev zlib zlib-dev openssl openssl-dev
@@ -23,7 +23,6 @@ RUN adduser -s /bin/bash -D -u 2000 tor
 RUN mkdir -p /var/run/tor && chown -R tor:tor /var/run/tor && chmod 2700 /var/run/tor
 RUN mkdir -p /home/tor/tor && chown -R tor:tor /home/tor/tor  && chmod 2700 /home/tor/tor
 
-COPY ./torrc /home/tor/tor/torrc
 COPY --from=builder /usr/local/ /usr/local/
 
 USER tor