Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
samourai-dojo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
10
Issues
10
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dojo
samourai-dojo
Commits
bd361bd0
Commit
bd361bd0
authored
Jan 29, 2021
by
kenshin-samourai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_mydojo_tor_0_4_5_4' into '1.8'
upgrade tor to v0.4.5.4 See merge request
!187
parents
ab7a1745
1959f6e4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
7 deletions
+25
-7
RELEASES.md
RELEASES.md
+18
-0
docker/my-dojo/.env
docker/my-dojo/.env
+3
-3
docker/my-dojo/tor/Dockerfile
docker/my-dojo/tor/Dockerfile
+2
-2
docker/my-dojo/whirlpool/Dockerfile
docker/my-dojo/whirlpool/Dockerfile
+2
-2
No files found.
RELEASES.md
View file @
bd361bd0
...
...
@@ -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 ##
...
...
docker/my-dojo/.env
View file @
bd361bd0
...
...
@@ -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
#########################################
...
...
docker/my-dojo/tor/Dockerfile
View file @
bd361bd0
...
...
@@ -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
...
...
docker/my-dojo/whirlpool/Dockerfile
View file @
bd361bd0
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment