Skip to content

Commit c3af06a

Browse files
add arm64 docker file
1 parent 27d8794 commit c3af06a

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

.devcontainer/Dockerfile

+13-12
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@
33

44
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/cpp/.devcontainer/base.Dockerfile
55
# [Choice] Debian / Ubuntu version (use Debian 12/11/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-12, debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
6-
ARG VARIANT=ubuntu-20.04
7-
FROM mcr.microsoft.com/vscode/devcontainers/cpp:${VARIANT}-arm64
6+
ARG VARIANT=ubuntu-24.04
7+
# FROM mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04
8+
FROM debian:bookworm
89

910
ARG DEBIAN_FRONTEND=noninteractive
10-
ENV TZ=Asian/Shanghai
11+
ENV TZ=Asia/Shanghai
1112

1213
# hadolint ignore=DL3008
1314
RUN apt-get update \
1415
&& apt-get upgrade -y \
1516
&& apt-get install -y apt-transport-https apt-utils build-essential \
16-
ca-certificates ccache cmake curl g++-multilib git gnupg \
17-
libgcc-12-dev lib32gcc-12-dev lsb-release \
17+
ca-certificates ccache cmake curl git gnupg \
18+
libgcc-12-dev lsb-release \
1819
ninja-build ocaml ocamlbuild \
1920
software-properties-common tree tzdata \
2021
unzip valgrind vim wget zip --no-install-recommends \
2122
&& apt-get clean -y \
2223
&& rm -rf /var/lib/apt/lists/*
23-
2424
#
2525
# binaryen
26-
ARG BINARYEN_VER=114
26+
ARG BINARYEN_VER=122
2727
WORKDIR /opt
28-
RUN wget -c --progress=dot:giga https://github.com/WebAssembly/binaryen/releases/download/version_${BINARYEN_VER}/binaryen-version_${BINARYEN_VER}-x86_64-linux.tar.gz \
29-
&& tar xf binaryen-version_${BINARYEN_VER}-x86_64-linux.tar.gz \
28+
RUN wget -c --progress=dot:giga https://github.com/WebAssembly/binaryen/releases/download/version_${BINARYEN_VER}/binaryen-version_${BINARYEN_VER}-aarch64-linux.tar.gz \
29+
&& tar xf binaryen-version_${BINARYEN_VER}-aarch64-linux.tar.gz \
3030
&& ln -sf /opt/binaryen-version_${BINARYEN_VER} /opt/binaryen \
31-
&& rm binaryen-version_${BINARYEN_VER}-x86_64-linux.tar.gz
31+
&& rm binaryen-version_${BINARYEN_VER}-aarch64-linux.tar.gz
3232

3333
#
3434
# CMAKE (https://apt.kitware.com/)
3535
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3636
# hadolint ignore=DL3008
3737
ARG CMAKE_VER=3.27.0
38-
RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Linux-x86_64.sh \
38+
RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Linux-aarch64.sh \
3939
-q -O /tmp/cmake-install.sh \
4040
&& chmod u+x /tmp/cmake-install.sh \
4141
&& mkdir /opt/cmake-${CMAKE_VER} \
@@ -82,7 +82,8 @@ RUN mkdir /opt/bazelisk \
8282
#
8383
# install clang+llvm
8484
ARG LLVM_VER=16
85-
RUN apt-get purge -y clang-14 llvm-14 && apt-get autoremove -y
85+
RUN apt-get purge -y clang-14 llvm-14 && apt-get autoremove -y || true
86+
RUN apt update && apt install -y software-properties-common
8687
WORKDIR /etc/apt/apt.conf.d
8788
RUN touch 99verfiy-peer.conf \
8889
&& echo "Acquire { https::Verify-Peer false }" > 99verfiy-peer.conf

0 commit comments

Comments
 (0)