From cbdf27a71cdee7f4f8dcda49db2a3cbc8ba3248c Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <dominique.marcadet@centralesupelec.fr>
Date: Fri, 30 Aug 2024 11:29:41 +0200
Subject: [PATCH] update to latest versions. Multiplatform image seems OK now.
---
Dockerfile | 11 +++--------
Makefile | 6 +-----
README.md | 10 ++++------
3 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1215f5b..0e9d88d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
-FROM --platform=${TARGETPLATFORM} gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-openvscode-server:${TARGETARCH}
+FROM --platform=${TARGETPLATFORM} gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-openvscode-server:latest
## software needed
-# g++-12 is available on Ubuntu 22.04, but boost currently depends on g++-11
RUN \
apt-get update \
&& apt-get install -y --no-install-recommends \
@@ -10,7 +9,7 @@ RUN \
clangd \
cmake \
gdb \
- g++-11 \
+ g++ \
googletest \
libboost-all-dev \
libgmp-dev \
@@ -18,15 +17,11 @@ RUN \
lldb \
make \
valgrind \
- && apt-get autoremove \
- && apt-get autoclean \
+ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN \
update-alternatives \
- --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 \
- --slave /usr/bin/g++ g++ /usr/bin/g++-11 \
- && update-alternatives \
--install /usr/bin/cc cc /usr/bin/clang 100 \
&& update-alternatives \
--install /usr/bin/c++ c++ /usr/bin/clang++ 100
diff --git a/Makefile b/Makefile
index 398e190..0ac170e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,7 @@
REPO = gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-openvscode-server-cpp
TAG = latest
-# No multi-platform image, see my-docker-images/docker-openvscode
all:
docker buildx create --use --node new-builder
- docker buildx build --load --platform "linux/amd64" --tag "${REPO}:amd64" .
- docker push "${REPO}:amd64"
- docker buildx build --load --platform "linux/arm64" --tag "${REPO}:arm64" .
- docker push "${REPO}:arm64"
+ docker buildx build --provenance=false --push --platform "linux/amd64","linux/arm64" --tag "${REPO}:${TAG}" .
diff --git a/README.md b/README.md
index 9216421..6df8cad 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ This image is based on [docker-openvscode-server](https://gitlab-research.centra
it adds the needed tools for C/C++ development.
Included tools are:
-- g++-11 (as g++), gcc-11 (as gcc)
-- clang++-14 (as c++), clang-14 (as cc)
+- g++-13 (as g++), gcc-13 (as gcc)
+- clang++-18 (as c++), clang-18 (as cc)
- clangd with its [VSCode extension](https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd)
- gdb
- lldb
@@ -26,12 +26,10 @@ Included tools are:
- The exposed port is 3000
- The user folder is `/config`
- the user and sudo password is `abc`
-- If docker (or podman) is installed on your computer, you can run (amd64 architecture) this
+- If docker (or podman) is installed on your computer, you can run (`amd64` or `arm64` architecture) this
image, assuming you are in a specific folder that will be shared with the container at
`/config`, with:
`docker run -p 3000:3000 -v "$(pwd):/config"
- gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-openvscode-server-cpp:amd64`
-- There is an image for arm64 architecture (tag `arm64`)
-
+ gitlab-research.centralesupelec.fr:4567/my-docker-images/docker-openvscode-server-cpp:latest`
--
GitLab