diff --git a/all/pom.xml b/all/pom.xml index 34fb802f78..b0fc7c2cc8 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -71,7 +71,7 @@ ${project.groupId} netty-transport-native-epoll - linux-aarch64 + linux-aarch_64 compile true @@ -107,7 +107,7 @@ ${project.groupId} netty-transport-native-epoll - linux-aarch64 + linux-aarch_64 compile true diff --git a/docker/README.md b/docker/README.md index 378c673c84..e66c984e2e 100644 --- a/docker/README.md +++ b/docker/README.md @@ -19,7 +19,7 @@ docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-7.1 ## aarch64 cross compile for transport-native-epoll on X86_64 ``` -docker-compose -f docker/docker-compose.yaml run cross-compile-aarch64 +docker-compose -f docker/docker-compose.yaml run cross-compile-aarch64-build ``` The default version of aarch64 gcc is `4.9-2016.02`. Update the parameter `gcc_version` in `docker-compose.yaml` to use a version you want. diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 10f389a7bc..a1fb55b972 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -49,7 +49,18 @@ services: args: gcc_version : "4.9-2016.02" - cross-compile-aarch64: + cross-compile-aarch64-shell: + image: netty:cross_compile_aarch64 + depends_on: [cross-compile-aarch64-runtime-setup] + volumes: + - ~/.ssh:/root/.ssh:delegated + - ~/.gnupg:/root/.gnupg:delegated + - ..:/code:delegated + - ~/.m2:/root/.m2:delegated + entrypoint: /bin/bash + working_dir: /code + + cross-compile-aarch64-build: image: netty:cross_compile_aarch64 depends_on: [cross-compile-aarch64-runtime-setup] volumes: diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml index 1a7a48ea9d..becf920e38 100644 --- a/transport-native-epoll/pom.xml +++ b/transport-native-epoll/pom.xml @@ -213,7 +213,8 @@ linux-aarch64 - ${os.detected.name}-aarch64 + + ${os.detected.name}-aarch_64 diff --git a/transport-native-unix-common/pom.xml b/transport-native-unix-common/pom.xml index d49e00f42b..ee9ba978d9 100644 --- a/transport-native-unix-common/pom.xml +++ b/transport-native-unix-common/pom.xml @@ -244,7 +244,8 @@ linux-aarch64 - ${os.detected.name}-aarch64 + + ${os.detected.name}-aarch_64 linux aarch64-linux-gnu-gcc aarch64-linux-gnu-ar