Skip to content

Commit 143f90b

Browse files
ItalyPaleAleshivamkm07
ItalyPaleAle
and
shivamkm07
authored
Fix makefile: Docker build (dapr#5845) (dapr#5857)
* fix makefile: Docker build * using conditional statements * adding flags to disable building specific images * using binaries variable * correcting typo --------- Signed-off-by: Shivam Kumar <[email protected]> Co-authored-by: Shivam Kumar <[email protected]>
1 parent f6a9a98 commit 143f90b

File tree

1 file changed

+140
-71
lines changed

1 file changed

+140
-71
lines changed

‎docker/docker.mk

+140-71
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,29 @@ ifeq ($(TARGET_ARCH),)
101101
$(error TARGET_ARCH environment variable must be set)
102102
endif
103103

104-
104+
docker-build: SHELL := $(shell which bash)
105105
docker-build: check-docker-env check-arch
106106
$(info Building $(DOCKER_IMAGE_TAG) docker images ...)
107107
ifeq ($(TARGET_ARCH),amd64)
108108
ifeq ($(ONLY_DAPR_IMAGE),true)
109109
$(DOCKER) build --build-arg PKG_FILES=* -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
110110
else
111111
$(DOCKER) build --build-arg PKG_FILES=* -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
112-
test -f "$(BIN_PATH)/daprd" && \
113-
$(DOCKER) build --build-arg PKG_FILES=daprd -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
114-
test -f "$(BIN_PATH)/placement" && \
115-
$(DOCKER) build --build-arg PKG_FILES=placement -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
116-
test -f "$(BIN_PATH)/sentry" && \
117-
$(DOCKER) build --build-arg PKG_FILES=sentry -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
118-
test -f "$(BIN_PATH)/operator" && \
119-
$(DOCKER) build --build-arg PKG_FILES=operator -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
120-
test -f "$(BIN_PATH)/injector" && \
121-
$(DOCKER) build --build-arg PKG_FILES=injector -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
112+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
113+
$(DOCKER) build --build-arg PKG_FILES=daprd -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
114+
fi
115+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
116+
$(DOCKER) build --build-arg PKG_FILES=placement -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
117+
fi
118+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
119+
$(DOCKER) build --build-arg PKG_FILES=sentry -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
120+
fi
121+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
122+
$(DOCKER) build --build-arg PKG_FILES=operator -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
123+
fi
124+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
125+
$(DOCKER) build --build-arg PKG_FILES=injector -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
126+
fi
122127
endif
123128
else
124129
-$(DOCKER) buildx create --use --name daprbuild
@@ -127,37 +132,48 @@ ifeq ($(ONLY_DAPR_IMAGE),true)
127132
$(DOCKER) buildx build --build-arg PKG_FILES=* --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
128133
else
129134
$(DOCKER) buildx build --build-arg PKG_FILES=* --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
130-
test -f "$(BIN_PATH)/daprd" && \
131-
$(DOCKER) buildx build --build-arg PKG_FILES=daprd --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
132-
test -f "$(BIN_PATH)/placement" && \
133-
$(DOCKER) buildx build --build-arg PKG_FILES=placement --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
134-
test -f "$(BIN_PATH)/sentry" && \
135-
$(DOCKER) buildx build --build-arg PKG_FILES=sentry --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
136-
test -f "$(BIN_PATH)/operator" && \
137-
$(DOCKER) buildx build --build-arg PKG_FILES=operator --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
138-
test -f "$(BIN_PATH)/injector" && \
139-
$(DOCKER) buildx build --build-arg PKG_FILES=injector --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
135+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
136+
$(DOCKER) buildx build --build-arg PKG_FILES=daprd --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
137+
fi
138+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
139+
$(DOCKER) buildx build --build-arg PKG_FILES=placement --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
140+
fi
141+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
142+
$(DOCKER) buildx build --build-arg PKG_FILES=sentry --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
143+
fi
144+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
145+
$(DOCKER) buildx build --build-arg PKG_FILES=operator --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
146+
fi
147+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
148+
$(DOCKER) buildx build --build-arg PKG_FILES=injector --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
149+
fi
140150
endif
141151
endif
142152

143153
# push docker image to the registry
154+
docker-push: SHELL := $(shell which bash)
144155
docker-push: docker-build
145156
$(info Pushing $(DOCKER_IMAGE_TAG) docker images ...)
146157
ifeq ($(TARGET_ARCH),amd64)
147158
ifeq ($(ONLY_DAPR_IMAGE),true)
148159
$(DOCKER) push $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
149160
else
150161
$(DOCKER) push $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
151-
test -f "$(BIN_PATH)/daprd" && \
152-
$(DOCKER) push $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
153-
test -f "$(BIN_PATH)/placement" && \
154-
$(DOCKER) push $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
155-
test -f "$(BIN_PATH)/sentry" && \
156-
$(DOCKER) push $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
157-
test -f "$(BIN_PATH)/operator" && \
158-
$(DOCKER) push $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
159-
test -f "$(BIN_PATH)/injector" && \
160-
$(DOCKER) push $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
162+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
163+
$(DOCKER) push $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
164+
fi
165+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
166+
$(DOCKER) push $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
167+
fi
168+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
169+
$(DOCKER) push $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
170+
fi
171+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
172+
$(DOCKER) push $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
173+
fi
174+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
175+
$(DOCKER) push $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
176+
fi
161177
endif
162178
else
163179
-$(DOCKER) buildx create --use --name daprbuild
@@ -166,84 +182,137 @@ ifeq ($(ONLY_DAPR_IMAGE),true)
166182
$(DOCKER) buildx build --build-arg PKG_FILES=* --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
167183
else
168184
$(DOCKER) buildx build --build-arg PKG_FILES=* --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
169-
test -f "$(BIN_PATH)/daprd" && \
170-
$(DOCKER) buildx build --build-arg PKG_FILES=daprd --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
171-
test -f "$(BIN_PATH)/placement" && \
172-
$(DOCKER) buildx build --build-arg PKG_FILES=placement --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
173-
test -f "$(BIN_PATH)/sentry" && \
174-
$(DOCKER) buildx build --build-arg PKG_FILES=sentry --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
175-
test -f "$(BIN_PATH)/operator" && \
176-
$(DOCKER) buildx build --build-arg PKG_FILES=operator --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
177-
test -f "$(BIN_PATH)/injector" && \
178-
$(DOCKER) buildx build --build-arg PKG_FILES=injector --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push
185+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
186+
$(DOCKER) buildx build --build-arg PKG_FILES=daprd --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push; \
187+
fi
188+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
189+
$(DOCKER) buildx build --build-arg PKG_FILES=placement --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push; \
190+
fi
191+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
192+
$(DOCKER) buildx build --build-arg PKG_FILES=sentry --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push; \
193+
fi
194+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
195+
$(DOCKER) buildx build --build-arg PKG_FILES=operator --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push; \
196+
fi
197+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
198+
$(DOCKER) buildx build --build-arg PKG_FILES=injector --platform $(DOCKER_IMAGE_PLATFORM) -f $(DOCKERFILE_DIR)/$(DOCKERFILE) $(BIN_PATH) -t $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH) --push; \
199+
fi
179200
endif
180201
endif
181202

182203
# push docker image to kind cluster
204+
docker-push-kind: SHELL := $(shell which bash)
183205
docker-push-kind: docker-build
184206
$(info Pushing $(DOCKER_IMAGE_TAG) docker image to kind cluster...)
185207
ifeq ($(ONLY_DAPR_IMAGE),true)
186208
kind load docker-image $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
187209
else
188210
kind load docker-image $(DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
189-
test -f "$(BIN_PATH)/daprd" && \
190-
kind load docker-image $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
191-
test -f "$(BIN_PATH)/placement" && \
192-
kind load docker-image $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
193-
test -f "$(BIN_PATH)/sentry" && \
194-
kind load docker-image $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
195-
test -f "$(BIN_PATH)/operator" && \
196-
kind load docker-image $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
197-
test -f "$(BIN_PATH)/injector" && \
198-
kind load docker-image $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH)
211+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
212+
kind load docker-image $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
213+
fi
214+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
215+
kind load docker-image $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
216+
fi
217+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
218+
kind load docker-image $(DAPR_SENTRY_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
219+
fi
220+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
221+
kind load docker-image $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
222+
fi
223+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
224+
kind load docker-image $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-$(TARGET_OS)-$(TARGET_ARCH); \
225+
fi
199226
endif
200227

201228
# publish muti-arch docker image to the registry
229+
docker-manifest-create: SHELL := $(shell which bash)
202230
docker-manifest-create: check-docker-env
203231
ifeq ($(ONLY_DAPR_IMAGE),true)
204232
$(DOCKER) manifest create $(DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DOCKER_IMAGE_TAG)-%)
205233
else
206234
$(DOCKER) manifest create $(DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DOCKER_IMAGE_TAG)-%)
207-
$(DOCKER) manifest create $(DAPR_RUNTIME_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-%)
208-
$(DOCKER) manifest create $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-%)
209-
$(DOCKER) manifest create $(DAPR_SENTRY_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_SENTRY_DOCKER_IMAGE_TAG)-%)
210-
$(DOCKER) manifest create $(DAPR_OPERATOR_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-%)
211-
$(DOCKER) manifest create $(DAPR_INJECTOR_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-%)
235+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
236+
$(DOCKER) manifest create $(DAPR_RUNTIME_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-%); \
237+
fi
238+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
239+
$(DOCKER) manifest create $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-%); \
240+
fi
241+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
242+
$(DOCKER) manifest create $(DAPR_SENTRY_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_SENTRY_DOCKER_IMAGE_TAG)-%); \
243+
fi
244+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
245+
$(DOCKER) manifest create $(DAPR_OPERATOR_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-%); \
246+
fi
247+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
248+
$(DOCKER) manifest create $(DAPR_INJECTOR_DOCKER_IMAGE_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-%); \
249+
fi
212250
endif
213251
ifeq ($(LATEST_RELEASE),true)
214252
ifeq ($(ONLY_DAPR_IMAGE),true)
215253
$(DOCKER) manifest create $(DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DOCKER_IMAGE_TAG)-%)
216254
else
217255
$(DOCKER) manifest create $(DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DOCKER_IMAGE_TAG)-%)
218-
$(DOCKER) manifest create $(DAPR_RUNTIME_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-%)
219-
$(DOCKER) manifest create $(DAPR_PLACEMENT_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-%)
220-
$(DOCKER) manifest create $(DAPR_SENTRY_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_SENTRY_DOCKER_IMAGE_TAG)-%)
221-
$(DOCKER) manifest create $(DAPR_OPERATOR_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-%)
222-
$(DOCKER) manifest create $(DAPR_INJECTOR_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-%)
256+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
257+
$(DOCKER) manifest create $(DAPR_RUNTIME_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_RUNTIME_DOCKER_IMAGE_TAG)-%); \
258+
fi
259+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
260+
$(DOCKER) manifest create $(DAPR_PLACEMENT_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)-%); \
261+
fi
262+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
263+
$(DOCKER) manifest create $(DAPR_SENTRY_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_SENTRY_DOCKER_IMAGE_TAG)-%); \
264+
fi
265+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
266+
$(DOCKER) manifest create $(DAPR_OPERATOR_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_OPERATOR_DOCKER_IMAGE_TAG)-%); \
267+
fi
268+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
269+
$(DOCKER) manifest create $(DAPR_INJECTOR_DOCKER_IMAGE_LATEST_TAG) $(DOCKER_MULTI_ARCH:%=$(DAPR_INJECTOR_DOCKER_IMAGE_TAG)-%); \
270+
fi
223271
endif
224272
endif
225273

274+
docker-publish: SHELL := $(shell which bash)
226275
docker-publish: docker-manifest-create
227276
ifeq ($(ONLY_DAPR_IMAGE),true)
228277
$(DOCKER) manifest push $(DOCKER_IMAGE_TAG)
229278
else
230279
$(DOCKER) manifest push $(DOCKER_IMAGE_TAG)
231-
$(DOCKER) manifest push $(DAPR_RUNTIME_DOCKER_IMAGE_TAG)
232-
$(DOCKER) manifest push $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG)
233-
$(DOCKER) manifest push $(DAPR_SENTRY_DOCKER_IMAGE_TAG)
234-
$(DOCKER) manifest push $(DAPR_OPERATOR_DOCKER_IMAGE_TAG)
235-
$(DOCKER) manifest push $(DAPR_INJECTOR_DOCKER_IMAGE_TAG)
280+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
281+
$(DOCKER) manifest push $(DAPR_RUNTIME_DOCKER_IMAGE_TAG); \
282+
fi
283+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
284+
$(DOCKER) manifest push $(DAPR_PLACEMENT_DOCKER_IMAGE_TAG); \
285+
fi
286+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
287+
$(DOCKER) manifest push $(DAPR_SENTRY_DOCKER_IMAGE_TAG); \
288+
fi
289+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
290+
$(DOCKER) manifest push $(DAPR_OPERATOR_DOCKER_IMAGE_TAG); \
291+
fi
292+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
293+
$(DOCKER) manifest push $(DAPR_INJECTOR_DOCKER_IMAGE_TAG); \
294+
fi
236295
endif
237296
ifeq ($(LATEST_RELEASE),true)
238297
ifeq ($(ONLY_DAPR_IMAGE),true)
239298
$(DOCKER) manifest push $(DOCKER_IMAGE_LATEST_TAG)
240299
else
241300
$(DOCKER) manifest push $(DOCKER_IMAGE_LATEST_TAG)
242-
$(DOCKER) manifest push $(DAPR_RUNTIME_DOCKER_IMAGE_LATEST_TAG)
243-
$(DOCKER) manifest push $(DAPR_PLACEMENT_DOCKER_IMAGE_LATEST_TAG)
244-
$(DOCKER) manifest push $(DAPR_SENTRY_DOCKER_IMAGE_LATEST_TAG)
245-
$(DOCKER) manifest push $(DAPR_OPERATOR_DOCKER_IMAGE_LATEST_TAG)
246-
$(DOCKER) manifest push $(DAPR_INJECTOR_DOCKER_IMAGE_LATEST_TAG)
301+
if [[ "$(BINARIES)" == *"daprd"* ]]; then \
302+
$(DOCKER) manifest push $(DAPR_RUNTIME_DOCKER_IMAGE_LATEST_TAG); \
303+
fi
304+
if [[ "$(BINARIES)" == *"placement"* ]]; then \
305+
$(DOCKER) manifest push $(DAPR_PLACEMENT_DOCKER_IMAGE_LATEST_TAG); \
306+
fi
307+
if [[ "$(BINARIES)" == *"sentry"* ]]; then \
308+
$(DOCKER) manifest push $(DAPR_SENTRY_DOCKER_IMAGE_LATEST_TAG); \
309+
fi
310+
if [[ "$(BINARIES)" == *"operator"* ]]; then \
311+
$(DOCKER) manifest push $(DAPR_OPERATOR_DOCKER_IMAGE_LATEST_TAG); \
312+
fi
313+
if [[ "$(BINARIES)" == *"injector"* ]]; then \
314+
$(DOCKER) manifest push $(DAPR_INJECTOR_DOCKER_IMAGE_LATEST_TAG); \
315+
fi
247316
endif
248317
endif
249318

0 commit comments

Comments
 (0)