diff --git a/changelog/@unreleased/pr-300.v2.yml b/changelog/@unreleased/pr-300.v2.yml new file mode 100644 index 00000000..eaeaf926 --- /dev/null +++ b/changelog/@unreleased/pr-300.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Now try both special paths for the vimagick/dante container, handling both old and latest containers. + links: + - https://github.com/palantir/docker-proxy-rule/pull/300 diff --git a/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml b/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml index 87c99252..a8ab09aa 100644 --- a/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml +++ b/docker-proxy-rule-core/src/main/resources/docker-compose.proxy.yml @@ -5,7 +5,7 @@ services: image: vimagick/dante:latest ports: - "1080" - command: bash -c 'sed -i.bak "s/username //" /etc/dante/sockd.conf && sockd -f /etc/dante/sockd.conf -p /run/sockd.pid -N 10' + command: bash -c '(sed -i.bak "s/username //" /etc/dante/sockd.conf && sockd -f /etc/dante/sockd.conf -p /run/sockd.pid -N 10) || (sed -i.bak "s/username //" /etc/sockd.conf && sockd -f /etc/dante/sockd.conf -p /tmp/sockd.pid)' networks: default: