diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-11 10:53:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 10:53:58 +0100 |
| commit | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (patch) | |
| tree | c57169b5a3d717f4e68b8ec5d2d6e220d1456434 /docker-compose.yml | |
| parent | d1da0a1086fa25f22739277fbf32ba1b3745317d (diff) | |
| parent | 394525e32994e605093c87d3a9fad2a4202f3401 (diff) | |
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index bd18676f1..faa066149 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -88,14 +88,13 @@ services: ## http_proxy=http://privoxy:8118 ## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true # tor: -# build: https://github.com/usbsnowcrash/docker-tor.git +# image: sirboops/tor # networks: # - external_network # - internal_network # # privoxy: -# build: https://github.com/usbsnowcrash/docker-privoxy.git -# command: /opt/sbin/privoxy --no-daemon --user privoxy.privoxy /opt/config +# image: sirboops/privoxy # volumes: # - ./priv-config:/opt/config # networks: |