Browse Source

Merge branch 'fix_mydojo_tor_0_4_5_4' into '1.8'

upgrade tor to v0.4.5.4

See merge request dojo/samourai-dojo!187
umbrel v1.8.1
kenshin-samourai 4 years ago
parent
commit
bd361bd088
  1. 18
      RELEASES.md
  2. 6
      docker/my-dojo/.env
  3. 4
      docker/my-dojo/tor/Dockerfile
  4. 4
      docker/my-dojo/whirlpool/Dockerfile

18
RELEASES.md

@ -3,6 +3,7 @@
## Releases ##
- [v1.8.1](#1_8_1)
- [v1.8.0](#1_8_0)
- [v1.7.0](#1_7_0)
- [v1.6.0](#1_6_0)
@ -14,6 +15,23 @@
- [v1.1.0](#1_1_0)
<a name="1_8_1"/>
## Samourai Dojo v1.8.1 ##
### Notable changes ###
#### Upgrade of tor to v0.4.5.4-rc ####
Upgrade to Tor v0.4.5.4-rc for a fix mitigating attacks on Tor v3 hidden services
### Change log ###
#### Security ####
- [320f8cbf](https://code.samourai.io/dojo/samourai-dojo/-/commit/320f8cbfbe5b6a1e59f5154110216758ed08b9dc) upgrade tor to v0.4.5.4
<a name="1_8_0"/>
## Samourai Dojo v1.8.0 ##

6
docker/my-dojo/.env

@ -10,15 +10,15 @@
COMPOSE_CONVERT_WINDOWS_PATHS=1
DOJO_VERSION_TAG=1.8.0
DOJO_VERSION_TAG=1.8.1
DOJO_DB_VERSION_TAG=1.2.0
DOJO_BITCOIND_VERSION_TAG=1.8.0
DOJO_NODEJS_VERSION_TAG=1.8.0
DOJO_NGINX_VERSION_TAG=1.5.0
DOJO_TOR_VERSION_TAG=1.5.0
DOJO_TOR_VERSION_TAG=1.5.1
DOJO_EXPLORER_VERSION_TAG=1.3.0
DOJO_INDEXER_VERSION_TAG=1.1.0
DOJO_WHIRLPOOL_VERSION_TAG=1.2.0
DOJO_WHIRLPOOL_VERSION_TAG=1.2.1
#########################################

4
docker/my-dojo/tor/Dockerfile

@ -3,7 +3,7 @@ FROM debian:buster
ENV TOR_HOME /var/lib/tor
ENV TOR_URL https://archive.torproject.org/tor-package-archive
ENV TOR_MIRROR_URL https://tor.eff.org/dist
ENV TOR_VERSION 0.4.2.7
ENV TOR_VERSION 0.4.5.4-rc
ENV TOR_GPG_KS_URI hkp://keyserver.ubuntu.com:80
ENV TOR_GPG_KEY1 0xEB5A896A28988BF5
ENV TOR_GPG_KEY2 0xC218525819F78451
@ -94,7 +94,7 @@ RUN chown tor:tor /wait-for-it.sh && \
chmod u+x /wait-for-it.sh && \
chmod g+x /wait-for-it.sh
# Expose socks port
# Expose socks port
EXPOSE 9050
# Switch to user tor

4
docker/my-dojo/whirlpool/Dockerfile

@ -21,7 +21,7 @@ RUN set -ex && \
# Install Tor
ENV WHIRLPOOL_TOR_URL https://archive.torproject.org/tor-package-archive
ENV WHIRLPOOL_TOR_MIRROR_URL https://tor.eff.org/dist
ENV WHIRLPOOL_TOR_VERSION 0.4.2.7
ENV WHIRLPOOL_TOR_VERSION 0.4.5.4-rc
ENV WHIRLPOOL_TOR_GPG_KS_URI hkp://keyserver.ubuntu.com:80
ENV WHIRLPOOL_TOR_GPG_KEY1 0xEB5A896A28988BF5
ENV WHIRLPOOL_TOR_GPG_KEY2 0xC218525819F78451
@ -81,7 +81,7 @@ RUN chown whirlpool:whirlpool /restart.sh && \
chmod u+x /restart.sh && \
chmod g+x /restart.sh
# Expose HTTP API port
# Expose HTTP API port
EXPOSE 8898
# Switch to user whirlpool

Loading…
Cancel
Save