|
diff --git a/Makefile b/Makefile |
|
index 01bb13d..3f676b9 100644 |
|
--- a/Makefile |
|
+++ b/Makefile |
|
@@ -37,7 +37,7 @@ export HOST_UID := $(shell id -u) |
|
export HOST_GID := $(shell id -g) |
|
|
|
# By default, build for amd64 |
|
-ARCH := amd64 |
|
+ARCH := arm64 |
|
|
|
# Source-code paths of the sysbox binary targets. |
|
SYSRUNC_DIR := sysbox-runc |
|
Submodule sysbox-fs contains modified content |
|
diff --git a/sysbox-fs/Makefile b/sysbox-fs/Makefile |
|
index ebeac98..e7278ed 100644 |
|
--- a/sysbox-fs/Makefile |
|
+++ b/sysbox-fs/Makefile |
|
@@ -6,7 +6,7 @@ |
|
.PHONY: clean sysbox-fs-debug sysbox-fs-static lint list-packages |
|
|
|
GO := go |
|
-ARCH := amd64 |
|
+ARCH := arm64 |
|
|
|
SYSFS_BUILDROOT := build |
|
SYSFS_BUILDDIR := $(SYSFS_BUILDROOT)/$(ARCH) |
|
Submodule sysbox-mgr contains modified content |
|
diff --git a/sysbox-mgr/Makefile b/sysbox-mgr/Makefile |
|
index 9c697b1..8ad25f0 100644 |
|
--- a/sysbox-mgr/Makefile |
|
+++ b/sysbox-mgr/Makefile |
|
@@ -6,7 +6,7 @@ |
|
.PHONY: clean sysbox-mgr-debug sysbox-mgr-static lint list-packages |
|
|
|
GO := go |
|
-ARCH := amd64 |
|
+ARCH := arm64 |
|
|
|
SYSMGR_BUILDROOT := build |
|
SYSMGR_BUILDDIR := $(SYSMGR_BUILDROOT)/$(ARCH) |
|
Submodule sysbox-runc contains modified content |
|
diff --git a/sysbox-runc/Makefile b/sysbox-runc/Makefile |
|
index f5f8d869..582d74f0 100644 |
|
--- a/sysbox-runc/Makefile |
|
+++ b/sysbox-runc/Makefile |
|
@@ -1,6 +1,6 @@ |
|
CONTAINER_ENGINE := docker |
|
GO := go |
|
-ARCH := amd64 |
|
+ARCH := arm64 |
|
|
|
RUNC_BUILDROOT := build |
|
RUNC_BUILDDIR := $(RUNC_BUILDROOT)/$(ARCH) |
|
diff --git a/tests/Dockerfile.ubuntu-focal b/tests/Dockerfile.ubuntu-focal |
|
index 96d6e41..03f2929 100644 |
|
--- a/tests/Dockerfile.ubuntu-focal |
|
+++ b/tests/Dockerfile.ubuntu-focal |
|
@@ -95,8 +95,8 @@ RUN apt-get update && apt-get install -y \ |
|
&& ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa |
|
|
|
# Install Golang 1.13 release and explicitly activate modules functionality. |
|
-RUN wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz && \ |
|
- tar -C /usr/local -xzf go1.13.3.linux-amd64.tar.gz && \ |
|
+RUN wget https://dl.google.com/go/go1.13.3.linux-arm64.tar.gz && \ |
|
+ tar -C /usr/local -xzf go1.13.3.linux-arm64.tar.gz && \ |
|
/usr/local/go/bin/go env -w GONOSUMDB=/root/nestybox |
|
|
|
ENV GOPATH /go |
|
@@ -120,8 +120,8 @@ RUN cd /tmp \ |
|
# install protoc compiler for gRPC |
|
RUN mkdir -p ~/bin/protoc \ |
|
&& cd ~/bin/protoc/ \ |
|
- && wget https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip \ |
|
- && unzip protoc-3.6.1-linux-x86_64.zip \ |
|
+ && wget https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-aarch_64.zip \ |
|
+ && unzip protoc-3.6.1-linux-aarch_64.zip \ |
|
&& mkdir -p /usr/local/include \ |
|
&& cp -r include/* /usr/local/include/ \ |
|
&& cp bin/protoc /usr/local/bin/ \ |
|
@@ -143,7 +143,7 @@ RUN apt-get update \ |
|
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - \ |
|
&& apt-key fingerprint 0EBFCD88 \ |
|
&& add-apt-repository \ |
|
- "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ |
|
+ "deb [arch=arm64] https://download.docker.com/linux/ubuntu \ |
|
$(lsb_release -cs) \ |
|
stable" \ |
|
&& apt-get update && apt-get install -y docker-ce docker-ce-cli containerd.io |
|
@@ -171,9 +171,9 @@ RUN echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontai |
|
&& curl -L https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable:cri-o:${crio_version}/${crio_os}/Release.key | apt-key add - \ |
|
&& curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${crio_os}/Release.key | apt-key add - \ |
|
&& apt-get update && apt-get install -y --no-install-recommends conntrack cri-o cri-o-runc \ |
|
- && wget https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}/crictl-${crictl_version}-linux-amd64.tar.gz \ |
|
- && sudo tar zxvf crictl-${crictl_version}-linux-amd64.tar.gz -C /usr/local/bin \ |
|
- && rm -f crictl-${crictl_version}-linux-amd64.tar.gz |
|
+ && wget https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictl_version}/crictl-${crictl_version}-linux-arm64.tar.gz \ |
|
+ && sudo tar zxvf crictl-${crictl_version}-linux-arm64.tar.gz -C /usr/local/bin \ |
|
+ && rm -f crictl-${crictl_version}-linux-arm64.tar.gz |
|
|
|
# Container CNIs (needed by CRI-O) |
|
RUN cd /root \ |
|
@@ -185,7 +185,7 @@ RUN cd /root \ |
|
&& cp bin/* /opt/cni/bin/ |
|
|
|
# Dasl (for yaml, toml, json parsing) (https://github.com/TomWright/dasel) |
|
-RUN curl -s https://api.github.com/repos/tomwright/dasel/releases/latest | grep browser_download_url | grep linux_amd64 | cut -d '"' -f 4 | wget -qi - && mv dasel_linux_amd64 dasel && chmod +x dasel \ |
|
+RUN curl -s https://api.github.com/repos/tomwright/dasel/releases/latest | grep browser_download_url | grep linux_arm64 | cut -d '"' -f 4 | wget -qi - && mv dasel_linux_arm64 dasel && chmod +x dasel \ |
|
&& mv ./dasel /usr/local/bin/dasel |
|
|
|
# Use the old definition for SECCOMP_NOTIF_ID_VALID in /usr/include/linux/seccomp.h |