Skip to content

Commit 169dc4a

Browse files
committed
Stop overwriting Docker tags
This helps to solve the #1360 issue
1 parent 1f4990a commit 169dc4a

File tree

3 files changed

+6
-126
lines changed

3 files changed

+6
-126
lines changed

Makefile

Lines changed: 1 addition & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
77
AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
88
PUSH_IMAGE := $(or $(PUSH_IMAGE),$(PUSH_IMAGE),false)
99
BUILD_ARGS := $(BUILD_ARGS)
10-
MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
11-
MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
12-
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
1310
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-4.3.1)
1411

1512
all: hub \
@@ -195,57 +192,7 @@ release_latest:
195192
docker push $(NAME)/standalone-firefox:latest
196193
docker push $(NAME)/standalone-docker:latest
197194

198-
tag_major_minor:
199-
docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:$(MAJOR)
200-
docker tag $(NAME)/hub:$(TAG_VERSION) $(NAME)/hub:$(MAJOR)
201-
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR)
202-
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR)
203-
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR)
204-
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR)
205-
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR)
206-
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR)
207-
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR)
208-
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:$(MAJOR)
209-
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:$(MAJOR)
210-
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:$(MAJOR)
211-
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:$(MAJOR)
212-
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:$(MAJOR)
213-
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR)
214-
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR)
215-
docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:$(MAJOR).$(MINOR)
216-
docker tag $(NAME)/hub:$(TAG_VERSION) $(NAME)/hub:$(MAJOR).$(MINOR)
217-
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR).$(MINOR)
218-
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR).$(MINOR)
219-
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR).$(MINOR)
220-
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR).$(MINOR)
221-
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR).$(MINOR)
222-
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR)
223-
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR)
224-
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:$(MAJOR).$(MINOR)
225-
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:$(MAJOR).$(MINOR)
226-
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:$(MAJOR).$(MINOR)
227-
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
228-
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:$(MAJOR).$(MINOR)
229-
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
230-
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR).$(MINOR)
231-
docker tag $(NAME)/base:$(TAG_VERSION) $(NAME)/base:$(MAJOR_MINOR_PATCH)
232-
docker tag $(NAME)/hub:$(TAG_VERSION) $(NAME)/hub:$(MAJOR_MINOR_PATCH)
233-
docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR_MINOR_PATCH)
234-
docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR_MINOR_PATCH)
235-
docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR_MINOR_PATCH)
236-
docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR_MINOR_PATCH)
237-
docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR_MINOR_PATCH)
238-
docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
239-
docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
240-
docker tag $(NAME)/node-edge:$(TAG_VERSION) $(NAME)/node-edge:$(MAJOR_MINOR_PATCH)
241-
docker tag $(NAME)/node-firefox:$(TAG_VERSION) $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
242-
docker tag $(NAME)/node-docker:$(TAG_VERSION) $(NAME)/node-docker:$(MAJOR_MINOR_PATCH)
243-
docker tag $(NAME)/standalone-chrome:$(TAG_VERSION) $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
244-
docker tag $(NAME)/standalone-edge:$(TAG_VERSION) $(NAME)/standalone-edge:$(MAJOR_MINOR_PATCH)
245-
docker tag $(NAME)/standalone-firefox:$(TAG_VERSION) $(NAME)/standalone-firefox:$(MAJOR_MINOR_PATCH)
246-
docker tag $(NAME)/standalone-docker:$(TAG_VERSION) $(NAME)/standalone-docker:$(MAJOR_MINOR_PATCH)
247-
248-
release: tag_major_minor
195+
release:
249196
@if ! docker images $(NAME)/base | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/base version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
250197
@if ! docker images $(NAME)/hub | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/hub version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
251198
@if ! docker images $(NAME)/distributor | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/distributor version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi
@@ -278,54 +225,6 @@ release: tag_major_minor
278225
docker push $(NAME)/standalone-edge:$(TAG_VERSION)
279226
docker push $(NAME)/standalone-firefox:$(TAG_VERSION)
280227
docker push $(NAME)/standalone-docker:$(TAG_VERSION)
281-
docker push $(NAME)/base:$(MAJOR)
282-
docker push $(NAME)/hub:$(MAJOR)
283-
docker push $(NAME)/distributor:$(MAJOR)
284-
docker push $(NAME)/router:$(MAJOR)
285-
docker push $(NAME)/sessions:$(MAJOR)
286-
docker push $(NAME)/session-queue:$(MAJOR)
287-
docker push $(NAME)/event-bus:$(MAJOR)
288-
docker push $(NAME)/node-base:$(MAJOR)
289-
docker push $(NAME)/node-chrome:$(MAJOR)
290-
docker push $(NAME)/node-edge:$(MAJOR)
291-
docker push $(NAME)/node-firefox:$(MAJOR)
292-
docker push $(NAME)/node-docker:$(MAJOR)
293-
docker push $(NAME)/standalone-chrome:$(MAJOR)
294-
docker push $(NAME)/standalone-edge:$(MAJOR)
295-
docker push $(NAME)/standalone-firefox:$(MAJOR)
296-
docker push $(NAME)/standalone-docker:$(MAJOR)
297-
docker push $(NAME)/base:$(MAJOR).$(MINOR)
298-
docker push $(NAME)/hub:$(MAJOR).$(MINOR)
299-
docker push $(NAME)/distributor:$(MAJOR).$(MINOR)
300-
docker push $(NAME)/router:$(MAJOR).$(MINOR)
301-
docker push $(NAME)/sessions:$(MAJOR).$(MINOR)
302-
docker push $(NAME)/session-queue:$(MAJOR).$(MINOR)
303-
docker push $(NAME)/event-bus:$(MAJOR).$(MINOR)
304-
docker push $(NAME)/node-base:$(MAJOR).$(MINOR)
305-
docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR)
306-
docker push $(NAME)/node-edge:$(MAJOR).$(MINOR)
307-
docker push $(NAME)/node-firefox:$(MAJOR).$(MINOR)
308-
docker push $(NAME)/node-docker:$(MAJOR).$(MINOR)
309-
docker push $(NAME)/standalone-chrome:$(MAJOR).$(MINOR)
310-
docker push $(NAME)/standalone-edge:$(MAJOR).$(MINOR)
311-
docker push $(NAME)/standalone-firefox:$(MAJOR).$(MINOR)
312-
docker push $(NAME)/standalone-docker:$(MAJOR).$(MINOR)
313-
docker push $(NAME)/base:$(MAJOR_MINOR_PATCH)
314-
docker push $(NAME)/hub:$(MAJOR_MINOR_PATCH)
315-
docker push $(NAME)/distributor:$(MAJOR_MINOR_PATCH)
316-
docker push $(NAME)/router:$(MAJOR_MINOR_PATCH)
317-
docker push $(NAME)/sessions:$(MAJOR_MINOR_PATCH)
318-
docker push $(NAME)/session-queue:$(MAJOR_MINOR_PATCH)
319-
docker push $(NAME)/event-bus:$(MAJOR_MINOR_PATCH)
320-
docker push $(NAME)/node-base:$(MAJOR_MINOR_PATCH)
321-
docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH)
322-
docker push $(NAME)/node-edge:$(MAJOR_MINOR_PATCH)
323-
docker push $(NAME)/node-firefox:$(MAJOR_MINOR_PATCH)
324-
docker push $(NAME)/node-docker:$(MAJOR_MINOR_PATCH)
325-
docker push $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
326-
docker push $(NAME)/standalone-edge:$(MAJOR_MINOR_PATCH)
327-
docker push $(NAME)/standalone-firefox:$(MAJOR_MINOR_PATCH)
328-
docker push $(NAME)/standalone-docker:$(MAJOR_MINOR_PATCH)
329228
docker push $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE)
330229
docker tag $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) $(NAME)/video:latest
331230
docker push $(NAME)/video:latest

generate_release_notes.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ echo "* ffmpeg: ${FFMPEG_VERSION}" >> release_notes.md
3333

3434
echo "" >> release_notes.md
3535
echo "### Published Docker images" >> release_notes.md
36+
echo "<details>" >> release_notes.md
37+
echo "<summary>Click to see published Docker images</summary>" >> release_notes.md
38+
echo "" >> release_notes.md
3639
echo '```' >> release_notes.md
3740
docker images --filter=reference='selenium/*:*' --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.Size}}" >> release_notes.md
3841
echo '```' >> release_notes.md
42+
echo "" >> release_notes.md
43+
echo "</details>" >> release_notes.md
3944

tag_and_push_browser_images.sh

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,14 @@ chrome)
3434
${CHROME_VERSION}-chromedriver-${CHROMEDRIVER_VERSION}-grid-${TAG_VERSION}
3535
# Browser version and browser driver version plus build date
3636
${CHROME_VERSION}-chromedriver-${CHROMEDRIVER_VERSION}-${BUILD_DATE}
37-
# Browser version and browser driver version
38-
${CHROME_VERSION}-chromedriver-${CHROMEDRIVER_VERSION}
3937
# Browser version and build date
4038
${CHROME_VERSION}-${BUILD_DATE}
41-
# Browser version
42-
${CHROME_VERSION}
4339
## Short versions
4440
${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}-grid-${TAG_VERSION}
4541
# Browser version and browser driver version plus build date
4642
${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}-${BUILD_DATE}
47-
# Browser version and browser driver version
48-
${CHROME_SHORT_VERSION}-chromedriver-${CHROMEDRIVER_SHORT_VERSION}
4943
# Browser version and build date
5044
${CHROME_SHORT_VERSION}-${BUILD_DATE}
51-
# Browser version
52-
${CHROME_SHORT_VERSION}
5345
)
5446

5547
for chrome_tag in "${CHROME_TAGS[@]}"
@@ -78,22 +70,14 @@ edge)
7870
${EDGE_VERSION}-edgedriver-${EDGEDRIVER_VERSION}-grid-${TAG_VERSION}
7971
# Browser version and browser driver version plus build date
8072
${EDGE_VERSION}-edgedriver-${EDGEDRIVER_VERSION}-${BUILD_DATE}
81-
# Browser version and browser driver version
82-
${EDGE_VERSION}-edgedriver-${EDGEDRIVER_VERSION}
8373
# Browser version and build date
8474
${EDGE_VERSION}-${BUILD_DATE}
85-
# Browser version
86-
${EDGE_VERSION}
8775
## Short versions
8876
${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}-grid-${TAG_VERSION}
8977
# Browser version and browser driver version plus build date
9078
${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}-${BUILD_DATE}
91-
# Browser version and browser driver version
92-
${EDGE_SHORT_VERSION}-edgedriver-${EDGEDRIVER_SHORT_VERSION}
9379
# Browser version and build date
9480
${EDGE_SHORT_VERSION}-${BUILD_DATE}
95-
# Browser version
96-
${EDGE_SHORT_VERSION}
9781
)
9882

9983
for edge_tag in "${EDGE_TAGS[@]}"
@@ -121,22 +105,14 @@ firefox)
121105
${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}-grid-${TAG_VERSION}
122106
# Browser version and browser driver version plus build date
123107
${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}-${BUILD_DATE}
124-
# Browser version and browser driver version
125-
${FIREFOX_VERSION}-geckodriver-${GECKODRIVER_VERSION}
126108
# Browser version and build date
127109
${FIREFOX_VERSION}-${BUILD_DATE}
128-
# Browser version
129-
${FIREFOX_VERSION}
130110
## Short versions
131111
${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}-grid-${TAG_VERSION}
132112
# Browser version and browser driver version plus build date
133113
${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}-${BUILD_DATE}
134-
# Browser version and browser driver version
135-
${FIREFOX_SHORT_VERSION}-geckodriver-${GECKODRIVER_SHORT_VERSION}
136114
# Browser version and build date
137115
${FIREFOX_SHORT_VERSION}-${BUILD_DATE}
138-
# Browser version
139-
${FIREFOX_SHORT_VERSION}
140116
)
141117

142118
for firefox_tag in "${FIREFOX_TAGS[@]}"

0 commit comments

Comments
 (0)