Skip to content

Commit 31fbe36

Browse files
ddavisonddavison
committed
edit makefile release to also tag major/majorminor releases
1 parent fa3551e commit 31fbe36

File tree

12 files changed

+65
-18
lines changed

12 files changed

+65
-18
lines changed

‎.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ after_success:
1919
- if [ "$TRAVIS_TAG" != "" ]; then
2020
docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
2121
VERSION="$TRAVIS_TAG" make release;
22-
a=( ${TRAVIS_TAG//./ });
23-
major="${a[0]}";
24-
minor="${a[1]}";
25-
VERSION="$major" make release;
26-
VERSION="$major.minor" make release;
2722
fi
2823
- if [[ "$TRAVIS_TAG" == "$LATEST"* ]]; then
2924
docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";

‎Hub/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.0.1-aluminum
5+
FROM selenium/base:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
#========================

‎Makefile

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
NAME := selenium
2-
VERSION := $(or $(VERSION),$(VERSION),'3.0.1-aluminum')
2+
VERSION := $(or $(VERSION),$(VERSION),3.0.1-barium)
33
PLATFORM := $(shell uname -s)
44
BUILD_ARGS := $(BUILD_ARGS)
5+
MAJOR:=$(word 1,$(subst ., ,$(VERSION)))
6+
MINOR:=$(word 2,$(subst ., ,$(VERSION)))
57

68
all: hub chrome firefox chrome_debug firefox_debug standalone_chrome standalone_firefox standalone_chrome_debug standalone_firefox_debug
79

@@ -97,7 +99,31 @@ tag_latest:
9799
docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:latest
98100
docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:latest
99101

100-
release:
102+
tag_major_minor:
103+
docker tag $(NAME)/base:$(VERSION) $(NAME)/base:$(MAJOR)
104+
docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:$(MAJOR)
105+
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR)
106+
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR)
107+
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR)
108+
docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR)
109+
docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR)
110+
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR)
111+
docker tag $(NAME)/standalone-firefox:$(VERSION) $(NAME)/standalone-firefox:$(MAJOR)
112+
docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:$(MAJOR)
113+
docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:$(MAJOR)
114+
docker tag $(NAME)/base:$(VERSION) $(NAME)/base:$(MAJOR).$(MINOR)
115+
docker tag $(NAME)/hub:$(VERSION) $(NAME)/hub:$(MAJOR).$(MINOR)
116+
docker tag $(NAME)/node-base:$(VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
117+
docker tag $(NAME)/node-chrome:$(VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
118+
docker tag $(NAME)/node-firefox:$(VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
119+
docker tag $(NAME)/node-chrome-debug:$(VERSION) $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
120+
docker tag $(NAME)/node-firefox-debug:$(VERSION) $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
121+
docker tag $(NAME)/standalone-chrome:$(VERSION) $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
122+
docker tag $(NAME)/standalone-firefox:$(VERSION) $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
123+
docker tag $(NAME)/standalone-chrome-debug:$(VERSION) $(NAME)/standalone-chrome-debug:$(MAJOR).$(MINOR)
124+
docker tag $(NAME)/standalone-firefox-debug:$(VERSION) $(NAME)/standalone-firefox-debug:$(MAJOR).$(MINOR)
125+
126+
release: tag_major_minor
101127
@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
102128
@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
103129
@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:
121147
docker push $(NAME)/standalone-firefox:$(VERSION)
122148
docker push $(NAME)/standalone-chrome-debug:$(VERSION)
123149
docker push $(NAME)/standalone-firefox-debug:$(VERSION)
150+
docker push $(NAME)/base:$(MAJOR)
151+
docker push $(NAME)/hub:$(MAJOR)
152+
docker push $(NAME)/node-base:$(MAJOR)
153+
docker push $(NAME)/node-chrome:$(MAJOR)
154+
docker push $(NAME)/node-firefox:$(MAJOR)
155+
docker push $(NAME)/node-chrome-debug:$(MAJOR)
156+
docker push $(NAME)/node-firefox-debug:$(MAJOR)
157+
docker push $(NAME)/standalone-chrome:$(MAJOR)
158+
docker push $(NAME)/standalone-chrome:$(MAJOR)
159+
docker push $(NAME)/standalone-firefox:$(MAJOR)
160+
docker push $(NAME)/standalone-chrome-debug:$(MAJOR)
161+
docker push $(NAME)/standalone-firefox-debug:$(MAJOR)
162+
docker push $(NAME)/base:$(MAJOR).$(MINOR)
163+
docker push $(NAME)/hub:$(MAJOR).$(MINOR)
164+
docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
165+
docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
166+
docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
167+
docker push $(NAME)/node-chrome-debug:$(MAJOR).$(MINOR)
168+
docker push $(NAME)/node-firefox-debug:$(MAJOR).$(MINOR)
169+
docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
170+
docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
171+
docker push $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
172+
docker push $(NAME)/standalone-chrome-debug:$(MAJOR).$(MINOR)
173+
docker push $(NAME)/standalone-firefox-debug:$(MAJOR).$(MINOR)
174+
175+
124176

125177
test:
126178
./test.sh

‎NodeBase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.0.1-aluminum
5+
FROM selenium/base:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
ENV DEBIAN_FRONTEND noninteractive

‎NodeChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:3.0.1-aluminum
5+
FROM selenium/node-base:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎NodeChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-chrome:3.0.1-aluminum
5+
FROM selenium/node-chrome:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎NodeFirefox/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:3.0.1-aluminum
5+
FROM selenium/node-base:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root
99

1010
#=========
1111
# Firefox
1212
#=========
13-
ARG FIREFOX_VERSION=49.0.1
13+
ARG FIREFOX_VERSION=50.0
1414
RUN apt-get update -qqy \
1515
&& apt-get -qqy --no-install-recommends install firefox \
1616
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \

‎NodeFirefoxDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-firefox:3.0.1-aluminum
5+
FROM selenium/node-firefox:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneChrome/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-chrome:3.0.1-aluminum
5+
FROM selenium/node-chrome:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneChromeDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/standalone-chrome:3.0.1-aluminum
5+
FROM selenium/standalone-chrome:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneFirefox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-firefox:3.0.1-aluminum
5+
FROM selenium/node-firefox:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

‎StandaloneFirefoxDebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/standalone-firefox:3.0.1-aluminum
5+
FROM selenium/standalone-firefox:3.0.1-barium
66
MAINTAINER Selenium <[email protected]>
77

88
USER root

0 commit comments

Comments
 (0)