Skip to content

Commit

Permalink
Reduce image size by 500MB or so
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilyMatt committed Jul 21, 2024
1 parent 883af9d commit be9225e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
5 changes: 2 additions & 3 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs 2> /dev/null) stable" > /etc/apt/sources.list.d/docker.list
RUN apt update && apt install -y containerd.io docker-buildx-plugin docker-ce docker-ce-cli docker-compose-plugin

RUN apt upgrade -y

# Get LLVM, Clang
ARG LLVM_VERSION=17

RUN wget https://apt.llvm.org/llvm.sh
RUN chmod +x llvm.sh
RUN ./llvm.sh ${LLVM_VERSION} all
RUN ./llvm.sh ${LLVM_VERSION}
RUn apt update -y && apt install -y clang-${LLVM_VERSION} libomp-${LLVM_VERSION}-dev lld-${LLVM_VERSION} lldb-${LLVM_VERSION}
RUN rm llvm.sh

COPY set_alternatives.sh .
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ RUN apt update -y && apt install -y \
libtool lsb-release m4 openssl peg pkgconf python3 \
python3-pip python3-venv software-properties-common wget

RUN apt upgrade -y

# Get LLVM, Clang
ARG LLVM_VERSION=17

RUN wget https://apt.llvm.org/llvm.sh
RUN chmod +x llvm.sh
RUN ./llvm.sh ${LLVM_VERSION} all
RUN ./llvm.sh ${LLVM_VERSION}
RUn apt update -y && apt install -y clang-${LLVM_VERSION} libomp-${LLVM_VERSION}-dev lld-${LLVM_VERSION} lldb-${LLVM_VERSION}
RUN rm llvm.sh

COPY set_alternatives.sh .
Expand Down
9 changes: 0 additions & 9 deletions set_alternatives.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,11 @@ fi

update-alternatives --install /usr/bin/clang clang "/usr/bin/clang-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/clang++ clang++ "/usr/bin/clang++-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/clang-format clang-format "/usr/bin/clang-format-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/clang-tidy clang-tidy "/usr/bin/clang-tidy-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/clangd clangd "/usr/bin/clangd-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/ld ld "/usr/bin/lld-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/lldb lldb "/usr/bin/lldb-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-config llvm-config "/usr/bin/llvm-config-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-cov llvm-cov "/usr/bin/llvm-cov-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-nm llvm-nm "/usr/bin/llvm-nm-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-objdump llvm-objdump "/usr/bin/llvm-objdump-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-profdata llvm-profdata "/usr/bin/llvm-profdata-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-ranlib llvm-ranlib "/usr/bin/llvm-ranlib-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-readelf llvm-readelf "/usr/bin/llvm-readelf-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-readobj llvm-readobj "/usr/bin/llvm-readobj-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-size llvm-size "/usr/bin/llvm-size-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-strip llvm-strip "/usr/bin/llvm-strip-${LLVM_VERSION}" 100
update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer "/usr/bin/llvm-symbolizer-${LLVM_VERSION}" 100

Expand Down

0 comments on commit be9225e

Please sign in to comment.