You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2021/11/17 06:23:10 UTC
[GitHub] [skywalking] kezhenxu94 opened a new pull request #8141: Add Docker images for arm64 architecture
kezhenxu94 opened a new pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141
<!--
ā ļø Please make sure to read this template first, pull requests that don't accord with this template
maybe closed without notice.
Texts surrounded by `<` and `>` are meant to be replaced by you, e.g. <framework name>, <issue number>.
Put an `x` in the `[ ]` to mark the item as CHECKED. `[x]`
-->
<!-- ==== š Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist š ====
### Fix <bug description or the bug issue number or bug issue link>
- [ ] Add a unit test to verify that the fix works.
- [ ] Explain briefly why the bug exists and how to fix it.
==== š Remove this line WHEN AND ONLY WHEN you're fixing a bug, follow the checklist š ==== -->
<!-- ==== š Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist š ====
### Improve the performance of <class or module or ...>
- [ ] Add a benchmark for the improvement, refer to [the existing ones](https://github.com/apache/skywalking/blob/master/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java)
- [ ] The benchmark result.
```text
<Paste the benchmark results here>
```
- [ ] Links/URLs to the theory proof or discussion articles/blogs. <links/URLs here>
==== š Remove this line WHEN AND ONLY WHEN you're improving the performance, follow the checklist š ==== -->
<!-- ==== š Remove this line WHEN AND ONLY WHEN you're adding a new feature, follow the checklist š ====
### <Feature description>
- [ ] If this is non-trivial feature, paste the links/URLs to the design doc.
- [ ] Update the documentation to include this new feature.
- [ ] Tests(including UT, IT, E2E) are added to verify the new feature.
- [ ] If it's UI related, attach the screenshots below.
==== š Remove this line WHEN AND ONLY WHEN you're adding a new feature, follow the checklist š ==== -->
- [x] If this pull request closes/resolves/fixes an existing issue, replace the issue number. NO
- [x] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/CHANGES.md).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971253556
Which platforms are we going to push to docker and ghcr eventually?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mis98zb commented on a change in pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
mis98zb commented on a change in pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#discussion_r750940730
##########
File path: Makefile
##########
@@ -43,64 +43,47 @@ OAP_NAME ?= oap
UI_NAME ?= ui
TAG ?= latest
-.SECONDEXPANSION: #allow $@ to be used in dependency list
-
-.PHONY: docker docker.all docker.oap
+.PHONY: docker docker.all
docker: init build.all docker.all
DOCKER_TARGETS:=docker.oap docker.ui
-docker.all: $(DOCKER_TARGETS)
-
ifneq ($(SW_OAP_BASE_IMAGE),)
BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
endif
BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION)
-docker.oap: $(CONTEXT)/$(DIST)
-docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
-docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
-docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-docker.oap: NAME = $(OAP_NAME)
-docker.oap:
- $(DOCKER_RULE)
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
-docker.ui: $(CONTEXT)/$(DIST)
-docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
-docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
-docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-docker.ui: NAME = $(UI_NAME)
-docker.ui:
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
Review comment:
got it, then it is not a problem here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 edited a comment on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 edited a comment on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971535193
I end up changing the base image from `adoptopenjdk/openjdk:alpine-jre` to `adoptopenjdk/openjdk:jre`, which is closest to the previous one but supports amd64/arm64, all tests are passing, also no {high,critical} CVEs.
```
trivy --severity "HIGH,CRITICAL" adoptopenjdk/openjdk11:jre
2021-11-17T19:13:04.132+0800 INFO Detected OS: ubuntu
2021-11-17T19:13:04.132+0800 INFO Detecting Ubuntu vulnerabilities...
2021-11-17T19:13:04.134+0800 INFO Number of PL dependency files: 1
adoptopenjdk/openjdk11:jre (ubuntu 20.04)
=========================================
Total: 0 (HIGH: 0, CRITICAL: 0)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971266475
> > Which platforms are we going to push to docker and ghcr eventually?
>
> linux/amd64 and linux/arm64
Is this arm64 able to build on the top of a x86 Linux or Mac? (I never had a change to learn this, sorry)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#discussion_r750929990
##########
File path: Makefile
##########
@@ -43,64 +43,47 @@ OAP_NAME ?= oap
UI_NAME ?= ui
TAG ?= latest
-.SECONDEXPANSION: #allow $@ to be used in dependency list
-
-.PHONY: docker docker.all docker.oap
+.PHONY: docker docker.all
docker: init build.all docker.all
DOCKER_TARGETS:=docker.oap docker.ui
-docker.all: $(DOCKER_TARGETS)
-
ifneq ($(SW_OAP_BASE_IMAGE),)
BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
endif
BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION)
-docker.oap: $(CONTEXT)/$(DIST)
-docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
-docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
-docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-docker.oap: NAME = $(OAP_NAME)
-docker.oap:
- $(DOCKER_RULE)
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
-docker.ui: $(CONTEXT)/$(DIST)
-docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
-docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
-docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-docker.ui: NAME = $(UI_NAME)
-docker.ui:
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
Review comment:
> I remember I used to use --load on my pc and got warning "not support yet". Because local docker image cannot support multiple platform with same tag.
>
> Not sure if it works now.
`--load` is only to build an image just for local machine's use so there is no cross platforms in this mode, take a look at `PLATFORMS = ` (empty)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971543076
Got this. My question is more about, what are differences of image size and components built-in inside.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971535193
I end up changing the base image from `adoptopenjdk/openjdk:alpine-jre` to `adoptopenjdk/openjdk:jre`, which is closest to the previous one and all tests are passing, also no {high,critical} CVEs.
```
trivy --severity "HIGH,CRITICAL" adoptopenjdk/openjdk11:jre
2021-11-17T19:13:04.132+0800 INFO Detected OS: ubuntu
2021-11-17T19:13:04.132+0800 INFO Detecting Ubuntu vulnerabilities...
2021-11-17T19:13:04.134+0800 INFO Number of PL dependency files: 1
adoptopenjdk/openjdk11:jre (ubuntu 20.04)
=========================================
Total: 0 (HIGH: 0, CRITICAL: 0)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971541326
> Once it is JRE, I am fine. Just curious, what are the differences from `openjdk:alpine-jre`.
We previously use `adoptopenjdk/openjdk:alpine-jre`, which only has a `amd64` manifest in Docker image, so when building for `arm64` it cannot find the base image (for `arm64`), the difference is that `adoptopenjdk/openjdk:jre` provides both `amd64` and `arm64` manifest in Docker images so we can pull them as base image to build for both architectures.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 merged pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 merged pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 edited a comment on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 edited a comment on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971551392
Check these 2 images
<img width="1272" alt="Screen Shot 2021-11-17 at 20 49 38" src="https://user-images.githubusercontent.com/15965696/142203695-5c7d4d4a-fdfc-4412-92b1-e6e55493e8d7.png">
<img width="1273" alt="Screen Shot 2021-11-17 at 20 53 25" src="https://user-images.githubusercontent.com/15965696/142204297-6c735412-a018-459f-85e6-2a31179c0a27.png">
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971551392
Check these 2 images
<img width="1272" alt="Screen Shot 2021-11-17 at 20 49 38" src="https://user-images.githubusercontent.com/15965696/142203695-5c7d4d4a-fdfc-4412-92b1-e6e55493e8d7.png"
<img width="1273" alt="Screen Shot 2021-11-17 at 20 53 25" src="https://user-images.githubusercontent.com/15965696/142204297-6c735412-a018-459f-85e6-2a31179c0a27.png">
>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mis98zb commented on a change in pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
mis98zb commented on a change in pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#discussion_r750927651
##########
File path: Makefile
##########
@@ -43,64 +43,47 @@ OAP_NAME ?= oap
UI_NAME ?= ui
TAG ?= latest
-.SECONDEXPANSION: #allow $@ to be used in dependency list
-
-.PHONY: docker docker.all docker.oap
+.PHONY: docker docker.all
docker: init build.all docker.all
DOCKER_TARGETS:=docker.oap docker.ui
-docker.all: $(DOCKER_TARGETS)
-
ifneq ($(SW_OAP_BASE_IMAGE),)
BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
endif
BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION)
-docker.oap: $(CONTEXT)/$(DIST)
-docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
-docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
-docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-docker.oap: NAME = $(OAP_NAME)
-docker.oap:
- $(DOCKER_RULE)
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
-docker.ui: $(CONTEXT)/$(DIST)
-docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
-docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
-docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-docker.ui: NAME = $(UI_NAME)
-docker.ui:
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
+push.%: PLATFORMS = --platform linux/amd64,linux/arm64
+push.%: LOAD_OR_PUSH = --push
+
+docker.% push.docker.%: $(CONTEXT)/$(DIST) $(SW_ROOT)/docker/%/*
$(DOCKER_RULE)
-# $@ is the name of the target
+docker.all: $(DOCKER_TARGETS)
+docker.push: $(DOCKER_TARGETS:%=push.%)
+
# $^ the name of the dependencies for the target
# Rule Steps #
##############
-# 1. Make a directory $(DOCKER_BUILD_TOP)/%@
-# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$@
-# 3. This rule then changes directories to $(DOCKER_BUID_TOP)/$@
-# 4. This rule runs $(BUILD_PRE) prior to any docker build and only if specified as a dependency variable
-# 5. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
-
-DOCKER_RULE=time (mkdir -p $(DOCKER_BUILD_TOP)/$@ && cp -r $^ $(DOCKER_BUILD_TOP)/$@ && cd $(DOCKER_BUILD_TOP)/$@ && $(BUILD_PRE) docker build --no-cache $(BUILD_ARGS) -t $(HUB)/$(NAME):$(TAG) -f Dockerfile$(suffix $@) .)
-
-# for each docker.XXX target create a push.docker.XXX target that pushes
-# the local docker image to another hub
-# a possible optimization is to use tag.$(TGT) as a dependency to do the tag for us
-push.docker.oap: NAME = $(OAP_NAME)
-push.docker.ui: NAME = $(UI_NAME)
-
-$(foreach TGT,$(DOCKER_TARGETS),push.$(TGT)): push.%: %
- time (docker push $(HUB)/$(NAME):$(TAG))
-
-# create a DOCKER_PUSH_TARGETS that's each of DOCKER_TARGETS with a push. prefix
-DOCKER_PUSH_TARGETS:=
-$(foreach TGT,$(DOCKER_TARGETS),$(eval DOCKER_PUSH_TARGETS+=push.$(TGT)))
-
-# Will build and push docker images.
-docker.push: $(DOCKER_PUSH_TARGETS)
-
-
+# 1. Make a directory $(DOCKER_BUILD_TOP)/$(NAME)
+# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$(NAME)
+# 3. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
+
+define DOCKER_RULE
+ mkdir -p $(DOCKER_BUILD_TOP)/$(NAME)
+ cp -r $^ $(DOCKER_BUILD_TOP)/$(NAME)
Review comment:
makefile variables like $^ cannot be used inside define.
as my experience, the variable will be calculated before it is put to the place where it is called.
so, $^ cannot get the correct dependency list.
that's why I used parameter for the defined function...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] wu-sheng commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
wu-sheng commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971539185
Once it is JRE, I am fine. Just curious, what are the differences from `openjdk:alpine-jre`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971270253
> > > Which platforms are we going to push to docker and ghcr eventually?
> >
> >
> > linux/amd64 and linux/arm64
>
> Is this arm64 able to build on the top of a x86 Linux or Mac? (I never had a change to learn this, sorry)
Yes, that's why we need to leverage BuildKit to build cross platform images
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mis98zb commented on a change in pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
mis98zb commented on a change in pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#discussion_r750927835
##########
File path: Makefile
##########
@@ -43,64 +43,47 @@ OAP_NAME ?= oap
UI_NAME ?= ui
TAG ?= latest
-.SECONDEXPANSION: #allow $@ to be used in dependency list
-
-.PHONY: docker docker.all docker.oap
+.PHONY: docker docker.all
docker: init build.all docker.all
DOCKER_TARGETS:=docker.oap docker.ui
-docker.all: $(DOCKER_TARGETS)
-
ifneq ($(SW_OAP_BASE_IMAGE),)
BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
endif
BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION)
-docker.oap: $(CONTEXT)/$(DIST)
-docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
-docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
-docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-docker.oap: NAME = $(OAP_NAME)
-docker.oap:
- $(DOCKER_RULE)
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
-docker.ui: $(CONTEXT)/$(DIST)
-docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
-docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
-docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-docker.ui: NAME = $(UI_NAME)
-docker.ui:
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
Review comment:
I remember I used to use --load on my pc and got warning "not support yet". Because local docker image cannot support multiple platform with same tag.
Not sure if it works now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 commented on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971253848
> Which platforms are we going to push to docker and ghcr eventually?
linux/amd64 and linux/arm64
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] kezhenxu94 edited a comment on pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
kezhenxu94 edited a comment on pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#issuecomment-971535193
I end up changing the base image from `adoptopenjdk/openjdk:alpine-jre` to `adoptopenjdk/openjdk:jre` but supports amd64/arm64, which is closest to the previous one and all tests are passing, also no {high,critical} CVEs.
```
trivy --severity "HIGH,CRITICAL" adoptopenjdk/openjdk11:jre
2021-11-17T19:13:04.132+0800 INFO Detected OS: ubuntu
2021-11-17T19:13:04.132+0800 INFO Detecting Ubuntu vulnerabilities...
2021-11-17T19:13:04.134+0800 INFO Number of PL dependency files: 1
adoptopenjdk/openjdk11:jre (ubuntu 20.04)
=========================================
Total: 0 (HIGH: 0, CRITICAL: 0)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking] mis98zb commented on a change in pull request #8141: Add Docker images for arm64 architecture
Posted by GitBox <gi...@apache.org>.
mis98zb commented on a change in pull request #8141:
URL: https://github.com/apache/skywalking/pull/8141#discussion_r750954274
##########
File path: Makefile
##########
@@ -43,64 +43,47 @@ OAP_NAME ?= oap
UI_NAME ?= ui
TAG ?= latest
-.SECONDEXPANSION: #allow $@ to be used in dependency list
-
-.PHONY: docker docker.all docker.oap
+.PHONY: docker docker.all
docker: init build.all docker.all
DOCKER_TARGETS:=docker.oap docker.ui
-docker.all: $(DOCKER_TARGETS)
-
ifneq ($(SW_OAP_BASE_IMAGE),)
BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
endif
BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION)
-docker.oap: $(CONTEXT)/$(DIST)
-docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
-docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
-docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-docker.oap: NAME = $(OAP_NAME)
-docker.oap:
- $(DOCKER_RULE)
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
-docker.ui: $(CONTEXT)/$(DIST)
-docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
-docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
-docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-docker.ui: NAME = $(UI_NAME)
-docker.ui:
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
+push.%: PLATFORMS = --platform linux/amd64,linux/arm64
+push.%: LOAD_OR_PUSH = --push
+
+docker.% push.docker.%: $(CONTEXT)/$(DIST) $(SW_ROOT)/docker/%/*
$(DOCKER_RULE)
-# $@ is the name of the target
+docker.all: $(DOCKER_TARGETS)
+docker.push: $(DOCKER_TARGETS:%=push.%)
+
# $^ the name of the dependencies for the target
# Rule Steps #
##############
-# 1. Make a directory $(DOCKER_BUILD_TOP)/%@
-# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$@
-# 3. This rule then changes directories to $(DOCKER_BUID_TOP)/$@
-# 4. This rule runs $(BUILD_PRE) prior to any docker build and only if specified as a dependency variable
-# 5. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
-
-DOCKER_RULE=time (mkdir -p $(DOCKER_BUILD_TOP)/$@ && cp -r $^ $(DOCKER_BUILD_TOP)/$@ && cd $(DOCKER_BUILD_TOP)/$@ && $(BUILD_PRE) docker build --no-cache $(BUILD_ARGS) -t $(HUB)/$(NAME):$(TAG) -f Dockerfile$(suffix $@) .)
-
-# for each docker.XXX target create a push.docker.XXX target that pushes
-# the local docker image to another hub
-# a possible optimization is to use tag.$(TGT) as a dependency to do the tag for us
-push.docker.oap: NAME = $(OAP_NAME)
-push.docker.ui: NAME = $(UI_NAME)
-
-$(foreach TGT,$(DOCKER_TARGETS),push.$(TGT)): push.%: %
- time (docker push $(HUB)/$(NAME):$(TAG))
-
-# create a DOCKER_PUSH_TARGETS that's each of DOCKER_TARGETS with a push. prefix
-DOCKER_PUSH_TARGETS:=
-$(foreach TGT,$(DOCKER_TARGETS),$(eval DOCKER_PUSH_TARGETS+=push.$(TGT)))
-
-# Will build and push docker images.
-docker.push: $(DOCKER_PUSH_TARGETS)
-
-
+# 1. Make a directory $(DOCKER_BUILD_TOP)/$(NAME)
+# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$(NAME)
+# 3. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
+
+define DOCKER_RULE
+ mkdir -p $(DOCKER_BUILD_TOP)/$(NAME)
+ cp -r $^ $(DOCKER_BUILD_TOP)/$(NAME)
Review comment:
build passed... it shocks me much.../(ćoć)/~~
I find you use $(DOCKER_RULE) instead of $(call DOCKER_RULE), that may be the reason.
it works, that's fine.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org