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 2022/07/12 12:16:40 UTC
[skywalking-showcase] 01/01: Remove conflict plugin to fix gateway agent
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch fix/gateway
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 4876f9acf3bccb41dc1c4e80f24c260b795287bf
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Jul 12 20:16:30 2022 +0800
Remove conflict plugin to fix gateway agent
---
Makefile.in | 2 +-
services/gateway-service/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 074f6a9..017aefe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,7 +30,7 @@ SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap:84de39cc07440edd9b629afb384be61225
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui:84de39cc07440edd9b629afb384be61225663698
SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:bdcba1c93b1ad702a88f30b798df5e99d963689d
SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
-SW_AGENT_JAVA_IMAGE ?= ghcr.io/apache/skywalking-java/skywalking-java:b83865f6cd9477f12c8ae8bc3379c31d7d105072-java8
+SW_AGENT_JAVA_IMAGE ?= ghcr.io/apache/skywalking-java/skywalking-java:d75cdf51e1088a9cf2289b5588e8114fcf3099d7-java8
SW_AGENT_NODEJS_BACKEND_VERSION ?= 59ef1aed6a404e2e8afffbb4b81ea849ae4f3026
SW_AGENT_NODEJS_FRONTEND_VERSION ?= 1e31bd17dcebb616163d848fc435f3a2d4822fb8
diff --git a/services/gateway-service/Dockerfile b/services/gateway-service/Dockerfile
index ed37091..6d40797 100644
--- a/services/gateway-service/Dockerfile
+++ b/services/gateway-service/Dockerfile
@@ -23,6 +23,6 @@ FROM $SW_AGENT_JAVA_IMAGE
COPY build/libs/gateway-service-0.0.1-SNAPSHOT.jar /app.jar
-RUN mv /skywalking/agent/optional-plugins/apm-spring-cloud-gateway-*.jar /skywalking/agent/plugins/
+RUN mv /skywalking/agent/optional-plugins/apm-spring-cloud-gateway-3.x-plugin*.jar /skywalking/agent/plugins/
CMD ["java", "-jar", "/app.jar"]