From 31fbe36f54be9a88bc3c0842fdbd905cc3084ea3 Mon Sep 17 00:00:00 2001 From: Daniel Davison Date: Fri, 18 Nov 2016 01:08:03 -0500 Subject: [PATCH] edit makefile release to also tag major/majorminor releases --- .travis.yml | 5 --- Hub/Dockerfile | 2 +- Makefile | 56 +++++++++++++++++++++++++++++-- NodeBase/Dockerfile | 2 +- NodeChrome/Dockerfile | 2 +- NodeChromeDebug/Dockerfile | 2 +- NodeFirefox/Dockerfile | 4 +-- NodeFirefoxDebug/Dockerfile | 2 +- StandaloneChrome/Dockerfile | 2 +- StandaloneChromeDebug/Dockerfile | 2 +- StandaloneFirefox/Dockerfile | 2 +- StandaloneFirefoxDebug/Dockerfile | 2 +- 12 files changed, 65 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bb7efe58..48dba7bde 100644 --- 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 index 7f8e77812..947a18fa9 100644 --- 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 #======================== diff --git a/Makefile b/Makefile index 1a1607f41..8601b5242 100644 --- 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 index 294141538..57c94c0dd 100644 --- 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 ENV DEBIAN_FRONTEND noninteractive diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile index 153f8fd74..40348d801 100644 --- 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 USER root diff --git a/NodeChromeDebug/Dockerfile b/NodeChromeDebug/Dockerfile index 635494fd5..8751a812f 100644 --- 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 USER root diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index 75290e95a..8cebfe726 100644 --- a/NodeFirefox/Dockerfile +++ b/NodeFirefox/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 USER root @@ -10,7 +10,7 @@ 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 index 5ec3989d2..3db76da71 100644 --- 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 USER root diff --git a/StandaloneChrome/Dockerfile b/StandaloneChrome/Dockerfile index b1a2528a4..9e287c110 100644 --- 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 USER root diff --git a/StandaloneChromeDebug/Dockerfile b/StandaloneChromeDebug/Dockerfile index 04a587b16..f15496e81 100644 --- 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 USER root diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile index 0cff55b19..682671261 100644 --- 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 USER root diff --git a/StandaloneFirefoxDebug/Dockerfile b/StandaloneFirefoxDebug/Dockerfile index 845b7ca79..030b404a4 100644 --- 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 USER root