@@ -6,6 +6,7 @@ TAG_VERSION := $(VERSION)-$(BUILD_DATE)
6
6
NAMESPACE := $(or $(NAMESPACE ) ,$(NAMESPACE ) ,$(NAME ) )
7
7
AUTHORS := $(or $(AUTHORS ) ,$(AUTHORS ) ,SeleniumHQ)
8
8
PUSH_IMAGE := $(or $(PUSH_IMAGE ) ,$(PUSH_IMAGE ) ,false)
9
+ FROM_IMAGE_ARGS := --build-arg NAMESPACE=$(NAMESPACE ) --build-arg VERSION=$(TAG_VERSION ) --build-arg AUTHORS=$(AUTHORS )
9
10
BUILD_ARGS := $(BUILD_ARGS )
10
11
MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION ) ) )
11
12
MINOR := $(word 2,$(subst ., ,$(TAG_VERSION ) ) )
@@ -28,22 +29,6 @@ all: hub \
28
29
standalone_docker \
29
30
video
30
31
31
- generate_all : \
32
- generate_hub \
33
- generate_distributor \
34
- generate_router \
35
- generate_sessions \
36
- generate_sessionqueue \
37
- generate_event_bus \
38
- generate_node_base \
39
- generate_chrome \
40
- generate_edge \
41
- generate_firefox \
42
- generate_docker \
43
- generate_standalone_firefox \
44
- generate_standalone_chrome \
45
- generate_standalone_edge \
46
- generate_standalone_docker
47
32
48
33
build : all
49
34
@@ -52,95 +37,50 @@ ci: build test
52
37
base :
53
38
cd ./Base && docker build $(BUILD_ARGS ) -t $(NAME ) /base:$(TAG_VERSION ) .
54
39
55
- generate_hub :
56
- cd ./Hub && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
40
+ hub : base
41
+ cd ./Hub && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) -t $( NAME ) /hub: $( TAG_VERSION ) .
57
42
58
- hub : base generate_hub
59
- cd ./Hub && docker build $(BUILD_ARGS ) -t $(NAME ) /hub :$(TAG_VERSION ) .
43
+ distributor : base
44
+ cd ./Distributor && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) -t $(NAME ) /distributor :$(TAG_VERSION ) .
60
45
61
- generate_distributor :
62
- cd ./Distributor && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
46
+ router : base
47
+ cd ./Router && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) -t $( NAME ) /router: $( TAG_VERSION ) .
63
48
64
- distributor : base generate_distributor
65
- cd ./Distributor && docker build $(BUILD_ARGS ) -t $(NAME ) /distributor :$(TAG_VERSION ) .
49
+ sessions : base
50
+ cd ./Sessions && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) -t $(NAME ) /sessions :$(TAG_VERSION ) .
66
51
67
- generate_router :
68
- cd ./Router && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
52
+ sessionqueue : base
53
+ cd ./SessionQueue && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) -t $( NAME ) /session-queue: $( TAG_VERSION ) .
69
54
70
- router : base generate_router
71
- cd ./Router && docker build $(BUILD_ARGS ) -t $(NAME ) /router :$(TAG_VERSION ) .
55
+ event_bus : base
56
+ cd ./EventBus && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) -t $(NAME ) /event-bus :$(TAG_VERSION ) .
72
57
73
- generate_sessions :
74
- cd ./Sessions && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
58
+ node_base : base
59
+ cd ./NodeBase && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) -t $( NAME ) /node-base: $( TAG_VERSION ) .
75
60
76
- sessions : base generate_sessions
77
- cd ./Sessions && docker build $(BUILD_ARGS ) -t $(NAME ) /sessions :$(TAG_VERSION ) .
61
+ chrome : node_base
62
+ cd ./NodeChrome && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) -t $(NAME ) /node-chrome :$(TAG_VERSION ) .
78
63
79
- generate_sessionqueue :
80
- cd ./SessionQueue && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
64
+ edge : node_base
65
+ cd ./NodeEdge && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) -t $( NAME ) /node-edge: $( TAG_VERSION ) .
81
66
82
- sessionqueue : base generate_sessionqueue
83
- cd ./SessionQueue && docker build $(BUILD_ARGS ) -t $(NAME ) /session-queue :$(TAG_VERSION ) .
67
+ firefox : node_base
68
+ cd ./NodeFirefox && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) -t $(NAME ) /node-firefox :$(TAG_VERSION ) .
84
69
85
- generate_event_bus :
86
- cd ./EventBus && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
70
+ docker : base
71
+ cd ./NodeDocker && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) -t $( NAME ) /node-docker: $( TAG_VERSION ) .
87
72
88
- event_bus : base generate_event_bus
89
- cd ./EventBus && docker build $(BUILD_ARGS ) -t $(NAME ) /event-bus :$(TAG_VERSION ) .
73
+ standalone_docker : docker
74
+ cd ./StandaloneDocker && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) -t $(NAME ) /standalone-docker :$(TAG_VERSION ) .
90
75
91
- generate_node_base :
92
- cd ./NodeBase && ./generate.sh $( TAG_VERSION ) $(NAMESPACE ) $( AUTHORS )
76
+ standalone_firefox : firefox
77
+ cd ./Standalone && docker build $( BUILD_ARGS ) $(FROM_IMAGE_ARGS ) --build-arg BASE=node-firefox -t $( NAME ) /standalone-firefox: $( TAG_VERSION ) .
93
78
94
- node_base : base generate_node_base
95
- cd ./NodeBase && docker build $(BUILD_ARGS ) - t $(NAME ) /node-base :$(TAG_VERSION ) .
79
+ standalone_chrome : chrome
80
+ cd ./Standalone && docker build $(BUILD_ARGS ) $( FROM_IMAGE_ARGS ) --build-arg BASE=node-chrome - t $(NAME ) /standalone-chrome :$(TAG_VERSION ) .
96
81
97
- generate_chrome :
98
- cd ./NodeChrome && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
99
-
100
- chrome : node_base generate_chrome
101
- cd ./NodeChrome && docker build $(BUILD_ARGS ) -t $(NAME ) /node-chrome:$(TAG_VERSION ) .
102
-
103
- generate_edge :
104
- cd ./NodeEdge && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
105
-
106
- edge : node_base generate_edge
107
- cd ./NodeEdge && docker build $(BUILD_ARGS ) -t $(NAME ) /node-edge:$(TAG_VERSION ) .
108
-
109
- generate_firefox :
110
- cd ./NodeFirefox && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
111
-
112
- firefox : node_base generate_firefox
113
- cd ./NodeFirefox && docker build $(BUILD_ARGS ) -t $(NAME ) /node-firefox:$(TAG_VERSION ) .
114
-
115
- generate_docker :
116
- cd ./NodeDocker && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
117
-
118
- docker : base generate_docker
119
- cd ./NodeDocker && docker build $(BUILD_ARGS ) -t $(NAME ) /node-docker:$(TAG_VERSION ) .
120
-
121
- generate_standalone_docker :
122
- cd ./StandaloneDocker && ./generate.sh $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
123
-
124
- standalone_docker : docker generate_standalone_docker
125
- cd ./StandaloneDocker && docker build $(BUILD_ARGS ) -t $(NAME ) /standalone-docker:$(TAG_VERSION ) .
126
-
127
- generate_standalone_firefox :
128
- cd ./Standalone && ./generate.sh StandaloneFirefox node-firefox $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
129
-
130
- standalone_firefox : firefox generate_standalone_firefox
131
- cd ./StandaloneFirefox && docker build $(BUILD_ARGS ) -t $(NAME ) /standalone-firefox:$(TAG_VERSION ) .
132
-
133
- generate_standalone_chrome :
134
- cd ./Standalone && ./generate.sh StandaloneChrome node-chrome $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
135
-
136
- standalone_chrome : chrome generate_standalone_chrome
137
- cd ./StandaloneChrome && docker build $(BUILD_ARGS ) -t $(NAME ) /standalone-chrome:$(TAG_VERSION ) .
138
-
139
- generate_standalone_edge :
140
- cd ./Standalone && ./generate.sh StandaloneEdge node-edge $(TAG_VERSION ) $(NAMESPACE ) $(AUTHORS )
141
-
142
- standalone_edge : edge generate_standalone_edge
143
- cd ./StandaloneEdge && docker build $(BUILD_ARGS ) -t $(NAME ) /standalone-edge:$(TAG_VERSION ) .
82
+ standalone_edge : edge
83
+ cd ./Standalone && docker build $(BUILD_ARGS ) $(FROM_IMAGE_ARGS ) --build-arg BASE=node-edge -t $(NAME ) /standalone-edge:$(TAG_VERSION ) .
144
84
145
85
video :
146
86
cd ./Video && docker build $(BUILD_ARGS ) -t $(NAME ) /video:$(FFMPEG_TAG_VERSION ) -$(BUILD_DATE ) .
@@ -394,22 +334,6 @@ test_video: video hub chrome firefox edge
394
334
edge \
395
335
firefox \
396
336
docker \
397
- generate_all \
398
- generate_hub \
399
- generate_distributor \
400
- generate_router \
401
- generate_sessions \
402
- generate_sessionqueue \
403
- generate_event_bus \
404
- generate_node_base \
405
- generate_chrome \
406
- generate_edge \
407
- generate_firefox \
408
- generate_docker \
409
- generate_standalone_chrome \
410
- generate_standalone_edge \
411
- generate_standalone_firefox \
412
- generate_standalone_docker \
413
337
hub \
414
338
distributor \
415
339
router \
0 commit comments