From d89d8ee7138ca098d361041f9184759883615ee9 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Tue, 1 Mar 2016 10:31:38 -0800 Subject: [PATCH] Revert "Merge pull request #280 from jackgr/image-tags" This reverts commit 69f3b1d9b27477b3fce4afc9317017fe7d7f03b5, reversing changes made to e1c35b2e9d2755c94ec19dbb1b23e2759cd85789. --- expandybird/Makefile | 1 + include.mk | 2 -- manager/Makefile | 1 + resourcifier/Makefile | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/expandybird/Makefile b/expandybird/Makefile index 16f0c7882..df97481fd 100644 --- a/expandybird/Makefile +++ b/expandybird/Makefile @@ -19,6 +19,7 @@ include ../include.mk DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := expandybird +TAG := latest ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR) diff --git a/include.mk b/include.mk index 28b957e61..fba7d5f4e 100644 --- a/include.mk +++ b/include.mk @@ -5,8 +5,6 @@ info: @echo "Project: ${PROJECT}" @echo "Image: ${IMAGE}" -TAG := $(shell echo `date +"%s"`_`date +"%N"`) - .PHONY: test-unit test-unit: @echo Running tests... diff --git a/manager/Makefile b/manager/Makefile index 209c874f2..2e3a2ad55 100644 --- a/manager/Makefile +++ b/manager/Makefile @@ -19,6 +19,7 @@ include ../include.mk DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := manager +TAG := latest ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR) diff --git a/resourcifier/Makefile b/resourcifier/Makefile index 9d6eebe1a..1b80a7dca 100644 --- a/resourcifier/Makefile +++ b/resourcifier/Makefile @@ -21,6 +21,7 @@ include ../include.mk DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := resourcifier +TAG := latest ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR)