edit makefile release to also tag major/majorminor releases

SeleniumHQ · Nov 18, 2016 · 31fbe36 · 31fbe36
1 parent fa3551e
commit 31fbe36
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,11 +19,6 @@ after_success:
   - if [ "$TRAVIS_TAG" != "" ]; then
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
     VERSION="$TRAVIS_TAG" make release;
-    a=( ${TRAVIS_TAG//./ });
-    major="${a[0]}";
-    minor="${a[1]}";
-    VERSION="$major" make release;
-    VERSION="$major.minor" make release;
     fi
   - if [[ "$TRAVIS_TAG" == "$LATEST"* ]]; then
     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";

diff --git a/Hub/Dockerfile b/Hub/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:3.0.1-aluminum
+FROM selenium/base:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 #========================

diff --git a/Makefile b/Makefile
@@ -1,7 +1,9 @@
 NAME := selenium
-VERSION := $(or $(VERSION),$(VERSION),'3.0.1-aluminum')
+VERSION := $(or $(VERSION),$(VERSION),3.0.1-barium)
 PLATFORM := $(shell uname -s)
 BUILD_ARGS := $(BUILD_ARGS)
+MAJOR:=$(word 1,$(subst ., ,$(VERSION)))
+MINOR:=$(word 2,$(subst ., ,$(VERSION)))
 
 all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
 
@@ -97,7 +99,31 @@ tag_latest:
 	docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:latest
 	docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:latest
 
-release:
+tag_major_minor:
+	docker tag $(NAME)/base:$(VERSION) $(NAME)/base:$(MAJOR)
+	docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:$(MAJOR)
+	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR)
+	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR)
+	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR)
+	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR)
+	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR)
+	docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR)
+	docker tag $(NAME)/standalone-firefox:$(VERSION) $(NAME)/standalone-firefox:$(MAJOR)
+	docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:$(MAJOR)
+	docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:$(MAJOR) 
+	docker tag $(NAME)/base:$(VERSION) $(NAME)/base:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/standalone-firefox:$(VERSION) $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:$(MAJOR).$(MINOR)
+	docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:$(MAJOR).$(MINOR)
+
+release: tag_major_minor
 	@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/hub version $(VERSION) is not yet built. Please run 'make build'"; false; fi
 	@if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME)/node-base version $(VERSION) is not yet built. Please run 'make build'"; false; fi
@@ -121,6 +147,32 @@ release:
 	docker push $(NAME)/standalone-firefox:$(VERSION)
 	docker push $(NAME)/standalone-chrome-debug:$(VERSION)
 	docker push $(NAME)/standalone-firefox-debug:$(VERSION)
+	docker push $(NAME)/base:$(MAJOR)
+	docker push $(NAME)/hub:$(MAJOR)
+	docker push $(NAME)/node-base:$(MAJOR)
+	docker push $(NAME)/node-chrome:$(MAJOR)
+	docker push $(NAME)/node-firefox:$(MAJOR)
+	docker push $(NAME)/node-chrome-debug:$(MAJOR)
+	docker push $(NAME)/node-firefox-debug:$(MAJOR)
+	docker push $(NAME)/standalone-chrome:$(MAJOR)
+	docker push $(NAME)/standalone-chrome:$(MAJOR)
+	docker push $(NAME)/standalone-firefox:$(MAJOR)
+	docker push $(NAME)/standalone-chrome-debug:$(MAJOR)
+	docker push $(NAME)/standalone-firefox-debug:$(MAJOR)
+	docker push $(NAME)/base:$(MAJOR).$(MINOR)
+	docker push $(NAME)/hub:$(MAJOR).$(MINOR)
+	docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
+	docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
+	docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
+	docker push $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
+	docker push $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
+	docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
+	docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
+	docker push $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
+	docker push $(NAME)/standalone-chrome-debug:$(MAJOR).$(MINOR)
+	docker push $(NAME)/standalone-firefox-debug:$(MAJOR).$(MINOR)
+
+
 
 test:
 	./test.sh

diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/base:3.0.1-aluminum
+FROM selenium/base:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-base:3.0.1-aluminum
+FROM selenium/node-base:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root

diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-chrome:3.0.1-aluminum
+FROM selenium/node-chrome:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root

diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile
@@ -2,15 +2,15 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-base:3.0.1-aluminum
+FROM selenium/node-base:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root
 
 #=========
 # Firefox
 #=========
-ARG FIREFOX_VERSION=49.0.1
+ARG FIREFOX_VERSION=50.0
 RUN apt-get update -qqy \
   && apt-get -qqy --no-install-recommends install firefox \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \

diff --git a/NodeFirefoxDebug/Dockerfile b/NodeFirefoxDebug/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-firefox:3.0.1-aluminum
+FROM selenium/node-firefox:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root

diff --git a/StandaloneChrome/Dockerfile b/StandaloneChrome/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-chrome:3.0.1-aluminum
+FROM selenium/node-chrome:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root

diff --git a/StandaloneChromeDebug/Dockerfile b/StandaloneChromeDebug/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/standalone-chrome:3.0.1-aluminum
+FROM selenium/standalone-chrome:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root

diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/node-firefox:3.0.1-aluminum
+FROM selenium/node-firefox:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root

diff --git a/StandaloneFirefoxDebug/Dockerfile b/StandaloneFirefoxDebug/Dockerfile
@@ -2,7 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM selenium/standalone-firefox:3.0.1-aluminum
+FROM selenium/standalone-firefox:3.0.1-barium
 MAINTAINER Selenium <selenium-developers@googlegroups.com>
 
 USER root