Remove "flux-" from images with flux already in name

Author: squaremo

Makefile

@@ -13,7 +13,7 @@ GODIRS:=$(COMPONENTS) common
 CMD_DIRS:=cmd/fluxd web fluxctl balancer/cmd/balagent
 
 image_stamp=docker/.$1.done
-docker_tag=$(PROJECT)-$1
+docker_tag=$(if $(filter flux%,$1),$(REPO)/$1,$(REPO)/flux-$1)
 
 GO_SRCS:=$(shell find * -name vendor -prune -o -name "*.go" -print)
 GODIRS:=$(shell find * -name vendor -prune -o -name "*_test.go" -printf "%H\n" | sort -u)

bin/fluxctl

@@ -7,4 +7,4 @@ if [[ -z "$ETCD_ADDRESS" ]]; then
 fi
 export ETCD_ADDRESS
 
-docker run --rm -e ETCD_ADDRESS weaveworks/flux-fluxctl "$@"
+docker run --rm -e ETCD_ADDRESS weaveworks/fluxctl "$@"

bin/run-flux

@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-DAEMON_IMAGE=weaveworks/flux-fluxd
+DAEMON_IMAGE=weaveworks/fluxd
 DEFAULT_ETCD="http://127.0.0.1:2379"
 
 start() {

site/daemon.md

@@ -9,7 +9,7 @@ The Flux daemon (`fluxd`) runs on each host, and does two things:
    which containers are service instances;
  - it proxies connections to services, for any clients on the host
 
-`fluxd` is available as the Docker image `weaveworks/flux-fluxd`.
+`fluxd` is available as the Docker image `weaveworks/fluxd`.
 
 ## Operating the daemon
 
@@ -41,7 +41,7 @@ a Docker command to start the daemon looks like this:
 docker run -d --name "fluxd" --cap-add=NET_ADMIN --net=host \
        -e HOST_IP -e ETCD_ADDRESS \
        -v "/var/run/docker.sock:/var/run/docker.sock" \
-       weaveworks/flux-fluxd
+       weaveworks/fluxd
 ```
 
 The script `bin/run-flux` is essentially a wrapper for this

site/getstarted.md

@@ -67,7 +67,7 @@ deployment scripts, but we show them in full here:
 $ docker run --name=fluxd -d -e ETCD_ADDRESS \
        --net=host --cap-add=NET_ADMIN \
        -v /var/run/docker.sock:/var/run/docker.sock \
-       weaveworks/flux-fluxd --host-ip $HOST_IP \
+       weaveworks/fluxd --host-ip $HOST_IP \
        --listen-prometheus=:9000 --advertise-prometheus=$HOST_IP:9000
 ```
 
@@ -88,7 +88,7 @@ Flux is now running, and you can check this in Docker:
 ```sh
 $ docker ps
 CONTAINER ID        IMAGE                             COMMAND                  CREATED             STATUS              PORTS                                                         NAMES
-27d30bc8ae4a        weaveworks/flux-fluxd             "/home/flux/fluxd --h"   3 seconds ago      Up 3 seconds                                                                    fluxd
+27d30bc8ae4a        weaveworks/fluxd                  "/home/flux/fluxd --h"   3 seconds ago      Up 3 seconds                                                                    fluxd
 # ...
 ```
 
@@ -99,7 +99,7 @@ Now we'll actually use Flux! Once it's running, you control Flux with
 an alias, to avoid typing the `docker run ...` bit again and again:
 
 ```sh
-$ alias fluxctl="docker run --rm -e ETCD_ADDRESS weaveworks/flux-fluxctl"
+$ alias fluxctl="docker run --rm -e ETCD_ADDRESS weaveworks/fluxctl"
 ```
 
 To try it out, see what `fluxctl info` gives us: