Fix that we don't produce a :latest tag

Makefile

@@ -103,6 +103,10 @@ clean:
 	# Delete images that we built in this repo
 	docker rmi $(NODE_CONTAINER_NAME):latest-$(ARCH) || true
 	docker rmi $(TEST_CONTAINER_NAME) || true
+ifeq ($(ARCH),amd64)
+	docker rmi $(NODE_CONTAINER_NAME):latest || true
+	docker rmi $(NODE_CONTAINER_NAME):$(VERSION) || true
+endif
 
 	# Retag and remove external images so that they will be pulled again
 	# We avoid just deleting the image. We didn't build them here so it would be impolite to delete it.
@@ -171,6 +175,9 @@ $(NODE_CONTAINER_CREATED): ./Dockerfile$(ARCHTAG) $(NODE_CONTAINER_FILES) $(addp
 	  echo; echo confd --version;        /go/bin/confd --version; \
 	"
 	docker build --pull -t $(NODE_CONTAINER_NAME):latest-$(ARCH) . --build-arg ver=$(CALICO_GIT_VER) -f ./Dockerfile$(ARCHTAG)
+ifeq ($(ARCH),amd64)
+	docker tag $(NODE_CONTAINER_NAME):latest-$(ARCH) $(NODE_CONTAINER_NAME):latest
+endif
 	touch $@
 
 # Get felix binaries