summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Containerfile5
-rw-r--r--Makefile2
2 files changed, 5 insertions, 2 deletions
diff --git a/Containerfile b/Containerfile
index 07ada9f..c761c26 100644
--- a/Containerfile
+++ b/Containerfile
@@ -35,7 +35,10 @@ LABEL org.opencontainers.image.description="A semi-statically linked cross-compi
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- libstdc++6 && \
+ gnupg libstdc++6 software-properties-common wget && \
+ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg && \
+ echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/questing/ llvm-toolchain-questing main" > /etc/apt/sources.list.d/llvm.list && \
+ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y --purge gnupg software-properties-common wget && \
rm -rf /var/lib/apt/lists/*
COPY --from=builder /opt/toolchain /opt/toolchain
diff --git a/Makefile b/Makefile
index 47bec20..240844c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ MPC_VERSION ?= 1.3.1
TARGET ?= x86_64-pc-elf
PLATFORM ?= x86-64
-IMAGE_BUILD ?= 3
+IMAGE_BUILD ?= 4
IMAGE_NAME = "registry.gitlab.ost.ch:45023/teachos/devcontainers"
IMAGE_TAG = "$(PLATFORM):$(GCC_VERSION)-$(IMAGE_BUILD)"