You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2023/02/23 07:31:34 UTC
[skywalking-python] branch master updated: Fix Docker build missing required ARG (#291)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new e1ed36b Fix Docker build missing required ARG (#291)
e1ed36b is described below
commit e1ed36bf526dad33bea4edc016b484b14e41193c
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Thu Feb 23 15:31:28 2023 +0800
Fix Docker build missing required ARG (#291)
---
Makefile | 4 ++--
docker/Makefile | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 349bd0f..bbf4ce1 100644
--- a/Makefile
+++ b/Makefile
@@ -112,11 +112,11 @@ upload: package
.PHONY: build-image
build-image:
- $(MAKE) -C docker build
+ $(MAKE) -C docker build AGENT_VERSION=$(VERSION)
.PHONY: push-image
push-image:
- $(MAKE) -C docker push
+ $(MAKE) -C docker push AGENT_VERSION=$(VERSION)
.PHONY: clean
# FIXME change to python based so we can run on windows
diff --git a/docker/Makefile b/docker/Makefile
index f44cbee..23c655d 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -18,7 +18,7 @@ D := docker
P := grpc http kafka
-TARGETS := py3.7 py3.8 py3.9 py3.10 python3.11 py3.7-slim py3.8-slim py3.9-slim py3.10-slim python3.11-slim
+TARGETS := py3.7 py3.8 py3.9 py3.10 py3.11 py3.7-slim py3.8-slim py3.9-slim py3.10-slim py3.11-slim
py3.7: BASE_PYTHON_IMAGE = python:3.7
py3.8: BASE_PYTHON_IMAGE = python:3.8
@@ -33,8 +33,6 @@ py3.11-slim: BASE_PYTHON_IMAGE = python:3.11-slim
PUSH_TARGETS := $(TARGETS:%=push-%)
-word-dash = $(word $2,$(subst -, ,$1))
-
build: $(TARGETS)
push: $(PUSH_TARGETS)
@@ -50,7 +48,7 @@ $(TARGETS):
$(PUSH_TARGETS):
- $(eval version := $(call word-dash,$@,2))
+ $(eval version := $(subst push-,,$@))
for p in $(P); do \
$(D) push apache/skywalking-python:${AGENT_VERSION}-$$p-${version}; \
done