Skip to content
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

Jump to bottom

Fix Docker build missing required ARG #291

Merged
merged 4 commits into from
Feb 23, 2023
Merged

Fix Docker build missing required ARG #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9e5edf
Fix Docker build missing required ARG
kezhenxu94 Feb 23, 2023
cf3ff5e
Fix another typo
kezhenxu94 Feb 23, 2023
827a5c8
Fix my typo
kezhenxu94 Feb 23, 2023
22bf7cf
Update Makefile
kezhenxu94 Feb 23, 2023
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand All @@ -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