Explorar el Código

Fix the issues

master
Ray Burgemeestre hace 2 años
padre
commit
45b000bdd0
Se han modificado 1 ficheros con 13 adiciones y 13 borrados
  1. +13
    -13
      Dockerfile-ubuntu2204

+ 13
- 13
Dockerfile-ubuntu2204 Ver fichero

@@ -4,18 +4,18 @@ MAINTAINER Ray Burgemeestre

ARG DEBIAN_FRONTEND=noninteractive

# The || true around apt-get update is to workaround a weird issue that only seems to happen
# in gocd CI
# EDIT: it did work, now we have to do the same trick for *all* the apt commands...
# TIP: when testing locally, remove all the || true stuff.... or we'll never find mistakes..
RUN apt-get update || true && \
apt-get -y install g++12 git sudo wget gnupg2 || true && \
apt-get -y install libssl-dev build-essential || true && \
apt-get -y install vim gdb strace patch || true && \
# This is a workaround for https://stackoverflow.com/questions/71941032/why-i-cannot-run-apt-update-inside-a-fresh-ubuntu22-04
RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' \
/etc/apt/apt.conf.d/docker-clean
RUN apt-get update && \
apt-get -y install g++12 git sudo wget gnupg2 && \
apt-get -y install libssl-dev build-essential && \
apt-get -y install vim gdb strace patch && \
\
apt update -y || true && \
apt-get install -y clang-14 clang-tidy-14 libclang-14-dev clangd-14 lldb-14 lld-14 clangd-14 || true && \
apt-get install -y libc++-14-dev libc++-14-dev clang-format-14 || true && \
apt update -y && \
apt-get install -y clang-14 clang-tidy-14 libclang-14-dev clangd-14 lldb-14 lld-14 clangd-14 && \
apt-get install -y libc++-14-dev libc++-14-dev clang-format-14 && \
\
rm -rf /var/lib/apt/lists/*

@@ -34,8 +34,8 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.24.1/cmake-3.24.1
rm -rf cmake-3.24.1.tar.gz

# Install emscripten deps
RUN sudo apt-get update || true && \
sudo apt-get install -y libsdl2-dev || true && \
RUN sudo apt-get update && \
sudo apt-get install -y libsdl2-dev && \
(git clone https://github.com/emscripten-core/emsdk.git || true) && \
cd emsdk && \
./emsdk install latest && \

Cargando…
Cancelar
Guardar