From f9a1c8fc64901423a027b07ba692fe48118d67ce Mon Sep 17 00:00:00 2001 From: Aidan Hobson Sayers Date: Tue, 6 Oct 2015 11:43:06 +0100 Subject: [PATCH 1/2] Update ambassador image, use the socat -t option Signed-off-by: Aidan Hobson Sayers --- docs/articles/ambassador_pattern_linking.md | 34 +++++++++++---------- docs/reference/builder.md | 22 +++++++------ 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/docs/articles/ambassador_pattern_linking.md b/docs/articles/ambassador_pattern_linking.md index 5a04540302..517933b007 100644 --- a/docs/articles/ambassador_pattern_linking.md +++ b/docs/articles/ambassador_pattern_linking.md @@ -107,7 +107,7 @@ to the world (via the `-p 6379:6379` port mapping): $ sudo ./contrib/mkimage-unittest.sh $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 docker-ut sh - $ socat TCP4-LISTEN:6379,fork,reuseaddr TCP4:172.17.0.136:6379 + $ socat -t 100000000 TCP4-LISTEN:6379,fork,reuseaddr TCP4:172.17.0.136:6379 Now ping the Redis server via the ambassador: @@ -116,7 +116,7 @@ Now go to a different server: $ sudo ./contrib/mkimage-unittest.sh $ docker run -t -i --expose 6379 --name redis_ambassador docker-ut sh - $ socat TCP4-LISTEN:6379,fork,reuseaddr TCP4:192.168.1.52:6379 + $ socat -t 100000000 TCP4-LISTEN:6379,fork,reuseaddr TCP4:192.168.1.52:6379 And get the `redis-cli` image so we can talk over the ambassador bridge. @@ -127,8 +127,8 @@ And get the `redis-cli` image so we can talk over the ambassador bridge. ## The svendowideit/ambassador Dockerfile -The `svendowideit/ambassador` image is a small `busybox` image with -`socat` built in. When you start the container, it uses a small `sed` +The `svendowideit/ambassador` image is based on the `alpine` image with +`socat` installed. When you start the container, it uses a small `sed` script to parse out the (possibly multiple) link environment variables to set up the port forwarding. On the remote host, you need to set the variable using the `-e` command line option. @@ -139,19 +139,21 @@ Will forward the local `1234` port to the remote IP and port, in this case `192.168.1.52:6379`. # - # - # first you need to build the docker-ut image - # using ./contrib/mkimage-unittest.sh - # then - # docker build -t SvenDowideit/ambassador . - # docker tag SvenDowideit/ambassador ambassador + # do + # docker build -t svendowideit/ambassador . # then to run it (on the host that has the real backend on it) - # docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 ambassador + # docker run -t -i -link redis:redis -name redis_ambassador -p 6379:6379 svendowideit/ambassador # on the remote host, you can set up another ambassador - # docker run -t -i --name redis_ambassador --expose 6379 sh + # docker run -t -i -name redis_ambassador -expose 6379 -e REDIS_PORT_6379_TCP=tcp://192.168.1.52:6379 svendowideit/ambassador sh + # you can read more about this process at https://docs.docker.com/articles/ambassador_pattern_linking/ - FROM docker-ut - MAINTAINER SvenDowideit@home.org.au + # use alpine because its a minimal image with a package manager. + # prettymuch all that is needed is a container that has a functioning env and socat (or equivalent) + FROM alpine:3.2 + MAINTAINER SvenDowideit@home.org.au - - CMD env | grep _TCP= | sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' | sh && top + RUN apk update && \ + apk add socat && \ + rm -r /var/cache/ + + CMD env | grep _TCP= | sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \& wait/' | sh diff --git a/docs/reference/builder.md b/docs/reference/builder.md index 89b7602656..a13c04e2f5 100644 --- a/docs/reference/builder.md +++ b/docs/reference/builder.md @@ -72,18 +72,20 @@ accelerating `docker build` significantly (indicated by `Using cache` - see the [`Dockerfile` Best Practices guide](/articles/dockerfile_best-practices/#build-cache) for more information): - $ docker build -t SvenDowideit/ambassador . - Uploading context 10.24 kB - Uploading context - Step 1 : FROM docker-ut - ---> cbba202fe96b - Step 2 : MAINTAINER SvenDowideit@home.org.au + $ docker build -t svendowideit/ambassador . + Sending build context to Docker daemon 15.36 kB + Step 0 : FROM alpine:3.2 + ---> 31f630c65071 + Step 1 : MAINTAINER SvenDowideit@home.org.au ---> Using cache - ---> 51182097be13 - Step 3 : CMD env | grep _TCP= | sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' | sh && top + ---> 2a1c91448f5f + Step 2 : RUN apk update && apk add socat && rm -r /var/cache/ ---> Using cache - ---> 1a5ffc17324d - Successfully built 1a5ffc17324d + ---> 21ed6e7fbb73 + Step 3 : CMD env | grep _TCP= | sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \& wait/' | sh + ---> Using cache + ---> 7ea8aef582cc + Successfully built 7ea8aef582cc When you're done with your build, you're ready to look into [*Pushing a repository to its registry*]( /userguide/dockerrepos/#contributing-to-docker-hub). From ac9c0f81df348519ed3fba337fb862952afed58b Mon Sep 17 00:00:00 2001 From: Aidan Hobson Sayers Date: Thu, 15 Oct 2015 15:01:55 +0100 Subject: [PATCH 2/2] Remove references to the docker-ut image Signed-off-by: Aidan Hobson Sayers --- docs/articles/ambassador_pattern_linking.md | 29 +++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/articles/ambassador_pattern_linking.md b/docs/articles/ambassador_pattern_linking.md index 517933b007..ab09f01934 100644 --- a/docs/articles/ambassador_pattern_linking.md +++ b/docs/articles/ambassador_pattern_linking.md @@ -81,42 +81,43 @@ On the Docker host (192.168.1.52) that Redis will run on: ^D # add redis ambassador - $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 busybox sh + $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 alpine:3.2 sh In the `redis_ambassador` container, you can see the linked Redis containers `env`: - $ env + / # env REDIS_PORT=tcp://172.17.0.136:6379 REDIS_PORT_6379_TCP_ADDR=172.17.0.136 REDIS_NAME=/redis_ambassador/redis HOSTNAME=19d7adf4705e + SHLVL=1 + HOME=/root REDIS_PORT_6379_TCP_PORT=6379 - HOME=/ REDIS_PORT_6379_TCP_PROTO=tcp - container=lxc REDIS_PORT_6379_TCP=tcp://172.17.0.136:6379 TERM=xterm PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PWD=/ + / # exit This environment is used by the ambassador `socat` script to expose Redis to the world (via the `-p 6379:6379` port mapping): $ docker rm redis_ambassador - $ sudo ./contrib/mkimage-unittest.sh - $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 docker-ut sh - - $ socat -t 100000000 TCP4-LISTEN:6379,fork,reuseaddr TCP4:172.17.0.136:6379 + $ CMD="apk update && apk add socat && sh" + $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 alpine:3.2 sh -c "$CMD" + [...] + / # socat -t 100000000 TCP4-LISTEN:6379,fork,reuseaddr TCP4:172.17.0.136:6379 Now ping the Redis server via the ambassador: Now go to a different server: - $ sudo ./contrib/mkimage-unittest.sh - $ docker run -t -i --expose 6379 --name redis_ambassador docker-ut sh - - $ socat -t 100000000 TCP4-LISTEN:6379,fork,reuseaddr TCP4:192.168.1.52:6379 + $ CMD="apk update && apk add socat && sh" + $ docker run -t -i --expose 6379 --name redis_ambassador alpine:3.2 sh -c "$CMD" + [...] + / # socat -t 100000000 TCP4-LISTEN:6379,fork,reuseaddr TCP4:192.168.1.52:6379 And get the `redis-cli` image so we can talk over the ambassador bridge. @@ -127,7 +128,7 @@ And get the `redis-cli` image so we can talk over the ambassador bridge. ## The svendowideit/ambassador Dockerfile -The `svendowideit/ambassador` image is based on the `alpine` image with +The `svendowideit/ambassador` image is based on the `alpine:3.2` image with `socat` installed. When you start the container, it uses a small `sed` script to parse out the (possibly multiple) link environment variables to set up the port forwarding. On the remote host, you need to set the @@ -155,5 +156,5 @@ case `192.168.1.52:6379`. RUN apk update && \ apk add socat && \ rm -r /var/cache/ - + CMD env | grep _TCP= | sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \& wait/' | sh