dockerfile and doc fixes

tcurdt · Nov 5, 2015 · 803d47b · 803d47b
1 parent ce996d0
commit 803d47b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,4 +15,5 @@ COPY src/upstream/nginx.tpl /srv/dockerx-upstream/nginx.tpl
 
 WORKDIR /srv/dockerx-upstream
 
-ENTRYPOINT [ "--template", "/srv/dockerx-upstream/nginx.tpl", "upstream", "--output", "/srv/dockerx-upstream/generated", "--label", "org.vafer.upstream", "--reload", "nginx", "--follow" ]
+ENTRYPOINT [ "dockerx-upstream" ]
+CMD [ "--template", "/srv/dockerx-upstream/nginx.tpl", "upstream", "--output", "/srv/dockerx-upstream/generated", "--label", "org.vafer.upstream", "--reload", "nginx", "--follow" ]
diff --git a/README.md b/README.md
@@ -23,16 +23,16 @@ Now `upstream` generates the missing upstream configuration bit based on the doc
 
     upstream \
       --label org.vafer.upstream \
-      --template /srv/upstream/nginx.tpl \
-      --output /srv/upstream/generated \
+      --template /some/nginx.tpl \
+      --output /other/generated \
       --reload nginx
       --follow # monitor docker containers
 
 Typically you would run upstream inside a container itself as well
 
     docker run --name upstream \
       -v /var/run/docker.sock:/var/run/docker.sock \
-      -v /etc/nginx/upstream.d/generated:/srv/upstream/generated \
+      -v /etc/nginx/upstream.d/generated:/srv/dockerx-upstream/generated \
       -dt tcurdt/dockerx-upstream \
       --label org.vafer.upstream \
       --template /srv/dockerx-upstream/nginx.tpl \
@@ -44,7 +44,7 @@ or just as a one-off command
 
     docker run --name upstream \
       -v /var/run/docker.sock:/var/run/docker.sock \
-      -v /etc/nginx/upstream.d/generated:/srv/upstream/generated \
+      -v /etc/nginx/upstream.d/generated:/srv/dockerx-upstream/generated \
       -t tcurdt/dockerx-upstream \
       --label org.vafer.upstream \
       --template /srv/dockerx-upstream/nginx.tpl \