You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/01/07 02:59:40 UTC
[incubator-shenyu] branch master updated: [ISSUE #2719] Docker image support arm architecture (#2722)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 6ca0074 [ISSUE #2719] Docker image support arm architecture (#2722)
6ca0074 is described below
commit 6ca007400ebd17eabc2769573c081652cecdf134
Author: Kunshuai Zhu <jo...@gmail.com>
AuthorDate: Fri Jan 7 10:57:12 2022 +0800
[ISSUE #2719] Docker image support arm architecture (#2722)
* [type: refactor] Docker image support arm architecture
* fix
* fix
* fix https
* fix https
---
shenyu-dist/shenyu-admin-dist/Dockerfile | 2 +-
shenyu-dist/shenyu-bootstrap-dist/Dockerfile | 2 +-
.../shenyu-examples-alibaba-dubbo-service/Dockerfile | 2 +-
.../shenyu-examples-apache-dubbo-service-xml/Dockerfile | 2 +-
.../shenyu-examples-apache-dubbo-service/Dockerfile | 2 +-
shenyu-examples/shenyu-examples-eureka/Dockerfile | 2 +-
shenyu-examples/shenyu-examples-grpc/Dockerfile | 2 +-
shenyu-examples/shenyu-examples-http/Dockerfile | 2 +-
.../shenyu-examples-motan/shenyu-examples-motan-service/Dockerfile | 2 +-
.../shenyu-examples-sofa/shenyu-examples-sofa-service/Dockerfile | 2 +-
shenyu-examples/shenyu-examples-springcloud/Dockerfile | 2 +-
shenyu-examples/shenyu-examples-springmvc/Dockerfile | 2 +-
shenyu-examples/shenyu-examples-websocket/Dockerfile | 2 +-
.../shenyu-integrated-test-agent-tracing-opentelemetry/Dockerfile | 4 ++--
shenyu-integrated-test/shenyu-integrated-test-combination/Dockerfile | 2 +-
shenyu-integrated-test/shenyu-integrated-test-grpc/Dockerfile | 2 +-
shenyu-integrated-test/shenyu-integrated-test-http/Dockerfile | 2 +-
shenyu-integrated-test/shenyu-integrated-test-motan/Dockerfile | 2 +-
shenyu-integrated-test/shenyu-integrated-test-sofa/Dockerfile | 2 +-
shenyu-integrated-test/shenyu-integrated-test-spring-cloud/Dockerfile | 2 +-
shenyu-integrated-test/shenyu-integrated-test-websocket/Dockerfile | 2 +-
.../shenyu-integration-test-alibaba-dubbo/Dockerfile | 2 +-
.../shenyu-integration-test-apache-dubbo/Dockerfile | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/shenyu-dist/shenyu-admin-dist/Dockerfile b/shenyu-dist/shenyu-admin-dist/Dockerfile
index 89beffa..a16a503 100644
--- a/shenyu-dist/shenyu-admin-dist/Dockerfile
+++ b/shenyu-dist/shenyu-admin-dist/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ARG APP_NAME
diff --git a/shenyu-dist/shenyu-bootstrap-dist/Dockerfile b/shenyu-dist/shenyu-bootstrap-dist/Dockerfile
index 6d9771d..8d137fb 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/Dockerfile
+++ b/shenyu-dist/shenyu-bootstrap-dist/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ARG APP_NAME
ENV LOCAL_PATH /opt/shenyu-bootstrap
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/Dockerfile b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/Dockerfile
index ca3cd87..f4a2fbd 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/Dockerfile
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-alibaba-dubbo-service/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-alibaba-dubbo-service
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
index 7e3e4a8..164a223 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-apache-dubbo-service-xml
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
index 8e12f24..eabd4a4 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-apache-dubbo-service
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-eureka/Dockerfile b/shenyu-examples/shenyu-examples-eureka/Dockerfile
index 339f694..a5c102b 100644
--- a/shenyu-examples/shenyu-examples-eureka/Dockerfile
+++ b/shenyu-examples/shenyu-examples-eureka/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-eureka
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-grpc/Dockerfile b/shenyu-examples/shenyu-examples-grpc/Dockerfile
index 21d0904..c92e73a 100644
--- a/shenyu-examples/shenyu-examples-grpc/Dockerfile
+++ b/shenyu-examples/shenyu-examples-grpc/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-grpc
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-http/Dockerfile b/shenyu-examples/shenyu-examples-http/Dockerfile
index 058f5aa..f5fd21f 100644
--- a/shenyu-examples/shenyu-examples-http/Dockerfile
+++ b/shenyu-examples/shenyu-examples-http/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-http
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/Dockerfile b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/Dockerfile
index f5a5c92..da170ff 100644
--- a/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/Dockerfile
+++ b/shenyu-examples/shenyu-examples-motan/shenyu-examples-motan-service/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-motan
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/Dockerfile b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/Dockerfile
index 11c6091..f74449a 100644
--- a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/Dockerfile
+++ b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-sofa
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-springcloud/Dockerfile b/shenyu-examples/shenyu-examples-springcloud/Dockerfile
index 14149ff..9c365bc 100644
--- a/shenyu-examples/shenyu-examples-springcloud/Dockerfile
+++ b/shenyu-examples/shenyu-examples-springcloud/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-springcloud
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-springmvc/Dockerfile b/shenyu-examples/shenyu-examples-springmvc/Dockerfile
index e44fc8f..ac19a0d 100644
--- a/shenyu-examples/shenyu-examples-springmvc/Dockerfile
+++ b/shenyu-examples/shenyu-examples-springmvc/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-springmvc
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-examples/shenyu-examples-websocket/Dockerfile b/shenyu-examples/shenyu-examples-websocket/Dockerfile
index 5fa4e9f..6f93f5a 100644
--- a/shenyu-examples/shenyu-examples-websocket/Dockerfile
+++ b/shenyu-examples/shenyu-examples-websocket/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-examples-websocket
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/Dockerfile
index dd84d12..42d3f9d 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-agent/shenyu-integrated-test-agent-tracing/shenyu-integrated-test-agent-tracing-opentelemetry/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM openjdk:8
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-agent-tracing-opentelemetry
ENV LOCAL_PATH /opt/${APP_NAME}
@@ -24,4 +24,4 @@ ADD target/${APP_NAME} ${LOCAL_PATH}
WORKDIR ${LOCAL_PATH}
EXPOSE 9195
-CMD ${LOCAL_PATH}/bin/start.sh agent && tail -f ${LOCAL_PATH}/logs/shenyu-bootstrap.log
+CMD /bin/sh ${LOCAL_PATH}/bin/start.sh agent && tail -f ${LOCAL_PATH}/logs/shenyu-bootstrap.log
diff --git a/shenyu-integrated-test/shenyu-integrated-test-combination/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-combination/Dockerfile
index c3cf22e..f995f71 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-combination/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-combination/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-combination
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-grpc/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-grpc/Dockerfile
index dca88c6..615a6cf 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-grpc/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-grpc/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-grpc
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-http/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-http/Dockerfile
index 5aee457..b810d8e 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-http/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-http/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-http
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-motan/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-motan/Dockerfile
index 2e2eaf1..30b8058 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-motan/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-motan/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-motan
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-sofa/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-sofa/Dockerfile
index df0fe9f..180f6bb 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-sofa
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/Dockerfile
index 8d9b90e..111e275 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-spring-cloud
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integrated-test-websocket/Dockerfile b/shenyu-integrated-test/shenyu-integrated-test-websocket/Dockerfile
index d64d433..86137c2 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-websocket/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integrated-test-websocket/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integrated-test-websocket
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/Dockerfile b/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/Dockerfile
index 06390e3..bea5e34 100644
--- a/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integration-test-alibaba-dubbo/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integration-test-alibaba-dubbo
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git a/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/Dockerfile b/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/Dockerfile
index 09e6498..168ff0a 100644
--- a/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/Dockerfile
+++ b/shenyu-integrated-test/shenyu-integration-test-apache-dubbo/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM java:openjdk-8-jre-alpine
+FROM openjdk:8-jre-alpine
ENV APP_NAME shenyu-integration-test-apache-dubbo
ENV LOCAL_PATH /opt/${APP_NAME}