upgrade ubuntu + sanitize packages
This commit is contained in:
@@ -1,23 +1,16 @@
|
|||||||
FROM ubuntu:24.04
|
FROM ubuntu:26.04
|
||||||
|
|
||||||
# Set timezone, noninteractive mode, and pipx path
|
# Set timezone, noninteractive mode, and pipx path
|
||||||
ENV TZ=Europe/Paris \
|
ENV TZ=Europe/Paris \
|
||||||
DEBIAN_FRONTEND=noninteractive \
|
DEBIAN_FRONTEND=noninteractive \
|
||||||
PATH="/root/.local/bin:$PATH"
|
PATH="/root/.local/bin:$PATH"
|
||||||
|
|
||||||
# Use build cache for ccache
|
|
||||||
RUN --mount=type=cache,target=/ccache
|
|
||||||
|
|
||||||
# Dummy sudo (no security weakening)
|
|
||||||
RUN echo '#!/bin/bash\n$@' > /usr/bin/sudo \
|
RUN echo '#!/bin/bash\n$@' > /usr/bin/sudo \
|
||||||
&& chmod +x /usr/bin/sudo
|
&& chmod +x /usr/bin/sudo
|
||||||
|
|
||||||
# Install base dependencies in one layer
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
unzip \
|
unzip \
|
||||||
curl \
|
curl \
|
||||||
wget \
|
wget \
|
||||||
lsb-release \
|
python3 \
|
||||||
software-properties-common \
|
pipx
|
||||||
gnupg \
|
|
||||||
python3
|
|
||||||
|
|||||||
@@ -1,22 +1,12 @@
|
|||||||
# Build arguments
|
|
||||||
ARG BASE_BUILDER
|
ARG BASE_BUILDER
|
||||||
|
|
||||||
# Base image
|
|
||||||
FROM $BASE_BUILDER
|
FROM $BASE_BUILDER
|
||||||
|
|
||||||
# Install system dependencies
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
cppcheck \
|
|
||||||
ccache \
|
ccache \
|
||||||
cmake \
|
|
||||||
ninja-build \
|
|
||||||
git \
|
git \
|
||||||
pkg-config \
|
pkg-config
|
||||||
wget \
|
|
||||||
lsb-release \
|
|
||||||
software-properties-common \
|
|
||||||
pipx
|
|
||||||
|
|
||||||
ENV PATH="/root/.local/bin:${PATH}"
|
ENV PATH="/root/.local/bin:${PATH}"
|
||||||
|
|
||||||
@@ -29,6 +19,7 @@ RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
|
|||||||
done \
|
done \
|
||||||
&& rm -f /tmp/llvm.sh*
|
&& rm -f /tmp/llvm.sh*
|
||||||
|
|
||||||
|
# Install Infer
|
||||||
RUN VERSION=1.2.0; \
|
RUN VERSION=1.2.0; \
|
||||||
curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \
|
curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \
|
||||||
| tar -C /opt -xJ && \
|
| tar -C /opt -xJ && \
|
||||||
|
|||||||
Reference in New Issue
Block a user