Re-add old container logic to handle older container versions (#300)

Co-authored-by: Callum Rogers <callumr@palantir.com>
palantir · Nov 4, 2020 · 97a7e1b · 97a7e1b
1 parent e4f4aea
commit 97a7e1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog/@unreleased/pr-300.v2.yml 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
@@ -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: