The Unified and Autonomous Development Platform
Some improvements and bug fixes for arm64 support
OneDev5d67e72d9d37
diff --git a/server-product/docker/Dockerfile.agent b/server-product/docker/Dockerfile.agentindex c844d27560..15c6ed308f 100644--- a/server-product/docker/Dockerfile.agent+++ b/server-product/docker/Dockerfile.agent@@ -1,11 +1,11 @@# Build the docker image for onedev agent-FROM ubuntu:22.04 AS build+FROM ubuntu:18.04 AS buildRUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*RUN curl -fsSL https://get.docker.com | sh-FROM ubuntu:22.04+FROM ubuntu:18.04COPY agent /agent-COPY entrypoint_agent.sh /agent/bin/entrypoint.sh+COPY entrypoint-agent.sh /root/bin/entrypoint.shCOPY --from=build /usr/bin/docker /usr/local/bin/dockerRUN apt-get update && apt-get install -y locales curl git git-lfs openjdk-11-jre-headless && rm -rf /var/lib/apt/lists/*RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \@@ -15,4 +15,4 @@ ENV LANGUAGE en_US:enENV LC_ALL en_US.UTF-8WORKDIR /agent/binRUN ["touch", "/agent/IN_DOCKER"]-CMD ["/agent/bin/entrypoint.sh"]+CMD ["/root/bin/entrypoint.sh"]diff --git a/server-product/docker/Dockerfile.server b/server-product/docker/Dockerfile.serverindex a8dab9e92b..b0e7d63dbe 100644--- a/server-product/docker/Dockerfile.server+++ b/server-product/docker/Dockerfile.server@@ -1,12 +1,13 @@# Build the docker image for onedev server-FROM ubuntu:22.04 AS build+FROM ubuntu:18.04 AS buildRUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*RUN curl -fsSL https://get.docker.com | sh-FROM ubuntu:22.04+FROM ubuntu:18.04ARG TARGETPLATFORM=linux/amd64COPY app /app-COPY entrypoint.sh idle.sh /root/bin/+COPY entrypoint-server.sh /root/bin/entrypoint.sh+COPY idle.sh /root/bin/RUN apt-get update && apt-get install -y locales iproute2 curl git git-lfs openjdk-11-jre-headless && rm -rf /var/lib/apt/lists/*RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \locale-gendiff --git a/server-product/docker/build.sh b/server-product/docker/build.shindex b158f66cba..e0c17417f2 100755--- a/server-product/docker/build.sh+++ b/server-product/docker/build.sh@@ -20,7 +20,11 @@ cp sandbox/site/lib/mysql* sandbox/site/lib/postgresql* docker/app/site/libdocker buildx create --name builderdocker buildx use builder-docker buildx build --push --platform linux/amd64,linux/arm64 -f docker/Dockerfile.server -t 1dev/server:$buildVersion -t 1dev/server:latest docker-cp -r agent docker/-docker buildx build --push --platform linux/amd64,linux/arm64 -f docker/Dockerfile.agent -t 1dev/agent:latest docker+if [ "$1" != "release" ] ; then+ docker buildx build --push --platform linux/amd64,linux/arm64 -f docker/Dockerfile.server -t 1dev/server:test docker+ docker buildx build --push --platform linux/amd64,linux/arm64 -f docker/Dockerfile.agent -t 1dev/agent:test docker+else+ docker buildx build --push --platform linux/amd64,linux/arm64 -f docker/Dockerfile.server -t 1dev/server:$buildVersion -t 1dev/server:latest docker+ docker buildx build --push --platform linux/amd64,linux/arm64 -f docker/Dockerfile.agent -t 1dev/agent:latest docker+fidiff --git a/server-product/docker/docker b/server-product/docker/dockerdeleted file mode 100755index ee72d7b096..0000000000Binary files a/server-product/docker/docker and /dev/null differdiff --git a/server-product/docker/entrypoint_agent.sh b/server-product/docker/entrypoint-agent.shsimilarity index 57%rename from server-product/docker/entrypoint_agent.shrename to server-product/docker/entrypoint-agent.shindex f799ceba24..41a793c47c 100755--- a/server-product/docker/entrypoint_agent.sh+++ b/server-product/docker/entrypoint-agent.sh@@ -12,12 +12,15 @@ trap _sigterm SIGTERMtrap _sigterm SIGINTUNAME=`uname -m`-CPUARCH=""-if [[ $UNAME == "x86_64" ]]; then- CPUARCH="x86-64"-elif [[ $UNAME == "aarch64" ]]; then+if [[ $UNAME == "aarch64" ]]; thenCPUARCH="arm-64"+else+ CPUARCH="x86-64"fi-/agent/boot/wrapper-linux-$CPUARCH /agent/conf/wrapper.conf\ No newline at end of file+cd /agent/boot+./wrapper-linux-$CPUARCH /agent/conf/wrapper.conf &++child=$!+wait "$child"diff --git a/server-product/docker/entrypoint.sh b/server-product/docker/entrypoint-server.shsimilarity index 100%rename from server-product/docker/entrypoint.shrename to server-product/docker/entrypoint-server.shdiff --git a/server-product/docker/kubectl b/server-product/docker/kubectldeleted file mode 100755index fbdba4a181..0000000000Binary files a/server-product/docker/kubectl and /dev/null differ