Skip to content

Initial set of files to support video recording #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 21, 2020
Merged

Initial set of files to support video recording #1111

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c48b9a5
Initial set of files to support video recording
diemol Sep 20, 2020
440a6e9
Adding Selenium Grid logo as wallpaper for Fluxbox
diemol Sep 20, 2020
a161f8a
Adding video image build to Makefile
diemol Sep 20, 2020
e0b9835
Fixing copy&paste error
diemol Sep 20, 2020
02bd48b
Adding docker-compose-v3-video.yml as example
diemol Sep 20, 2020
93153c4
Simple docs showing how to use video container
diemol Sep 21, 2020
1b54f3e
Adjusting tags in docker-compose-v3-video.yml
diemol Sep 21, 2020
900b2b5
Updating script that updates tags and dates in docs
diemol Sep 21, 2020
01b132f
Removing ambiguous commentary
diemol Sep 21, 2020
ce81e87
Adding ffmpeg version to release notes
diemol Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adding video image build to Makefile
  • Loading branch information
@diemol
diemol committed Sep 20, 2020
commit a161f8ac43815c3e0d1fa6d8f196ecac0b3401b3
22 changes: 20 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,20 @@ BUILD_ARGS := $(BUILD_ARGS)
MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-4.3.1)

all: hub distributor router sessions event_bus chrome firefox opera standalone_chrome standalone_firefox standalone_opera
all: hub \
distributor \
router \
sessions \
event_bus \
chrome \
firefox \
opera \
standalone_chrome \
standalone_firefox \
standalone_opera \
video

generate_all: \
generate_hub \
Expand Down Expand Up @@ -106,6 +118,10 @@ generate_standalone_opera:
standalone_opera: opera generate_standalone_opera
cd ./StandaloneOpera && docker build $(BUILD_ARGS) -t $(NAME)/standalone-opera:$(TAG_VERSION) .

# The video container should not change often, therefore
video:
cd ./Video && docker build $(BUILD_ARGS) -t $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) .


# https://github.com/SeleniumHQ/docker-selenium/issues/992
# Additional tags for browser images
Expand Down Expand Up @@ -257,6 +273,7 @@ release: tag_major_minor
docker push $(NAME)/standalone-chrome:$(MAJOR_MINOR_PATCH)
docker push $(NAME)/standalone-firefox:$(MAJOR_MINOR_PATCH)
docker push $(NAME)/standalone-opera:$(MAJOR_MINOR_PATCH)
docker push $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE)-$(BUILD_DATE)

test: test_chrome \
test_firefox \
Expand Down Expand Up @@ -316,4 +333,5 @@ test_opera_standalone:
standalone_firefox \
tag_latest \
tag_and_push_browser_images \
test
test \
video