diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index fafef66d3..bffd33166 100755 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,9 +1,9 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install software-properties-common -y # 18.04 includes 2.17 but github requires 2.18+ to support submodules. RUN add-apt-repository ppa:git-core/ppa -ADD .github/workflows/install_dependencies_build.sh install_dependencies_build.sh +ADD .github/workflows/install_dependencies_build_ubuntu22p04.sh install_dependencies_build.sh RUN bash install_dependencies_build.sh ADD requirements.txt requirements.txt RUN python3 -m pip install -r requirements.txt diff --git a/docker/Dockerfile.clang-10 b/docker/Dockerfile.clang-10 deleted file mode 100644 index 447c5fc81..000000000 --- a/docker/Dockerfile.clang-10 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/lnis-uofu/openfpga-build-base -RUN apt-get update && apt-get install -y clang-format-7 clang-10 diff --git a/docker/Dockerfile.clang-11 b/docker/Dockerfile.clang-11 new file mode 100644 index 000000000..4ba9ad201 --- /dev/null +++ b/docker/Dockerfile.clang-11 @@ -0,0 +1,2 @@ +FROM ghcr.io/lnis-uofu/openfpga-build-base +RUN apt-get update && apt-get install -y clang-format-14 clang-11 diff --git a/docker/Dockerfile.clang-12 b/docker/Dockerfile.clang-12 new file mode 100644 index 000000000..57a8dbd0d --- /dev/null +++ b/docker/Dockerfile.clang-12 @@ -0,0 +1,2 @@ +FROM ghcr.io/lnis-uofu/openfpga-build-base +RUN apt-get update && apt-get install -y clang-format-14 clang-12 diff --git a/docker/Dockerfile.clang-13 b/docker/Dockerfile.clang-13 new file mode 100644 index 000000000..902e8f29f --- /dev/null +++ b/docker/Dockerfile.clang-13 @@ -0,0 +1,2 @@ +FROM ghcr.io/lnis-uofu/openfpga-build-base +RUN apt-get update && apt-get install -y clang-format-14 clang-13 diff --git a/docker/Dockerfile.clang-14 b/docker/Dockerfile.clang-14 new file mode 100644 index 000000000..bad23c8b0 --- /dev/null +++ b/docker/Dockerfile.clang-14 @@ -0,0 +1,2 @@ +FROM ghcr.io/lnis-uofu/openfpga-build-base +RUN apt-get update && apt-get install -y clang-format-14 clang-14 diff --git a/docker/Dockerfile.clang-6.0 b/docker/Dockerfile.clang-6.0 deleted file mode 100644 index 6d7c36b3e..000000000 --- a/docker/Dockerfile.clang-6.0 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/lnis-uofu/openfpga-build-base -RUN apt-get update && apt-get install -y clang-format-7 clang-6.0 diff --git a/docker/Dockerfile.clang-7 b/docker/Dockerfile.clang-7 deleted file mode 100644 index 485a61318..000000000 --- a/docker/Dockerfile.clang-7 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/lnis-uofu/openfpga-build-base -RUN apt-get update && apt-get install -y clang-format-7 clang-7 diff --git a/docker/Dockerfile.clang-8 b/docker/Dockerfile.clang-8 deleted file mode 100644 index 5a4a5f4ef..000000000 --- a/docker/Dockerfile.clang-8 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/lnis-uofu/openfpga-build-base -RUN apt-get update && apt-get install -y clang-format-7 clang-8 diff --git a/docker/Dockerfile.env b/docker/Dockerfile.env index b2ca7c202..62620ebb3 100644 --- a/docker/Dockerfile.env +++ b/docker/Dockerfile.env @@ -1,9 +1,9 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install --no-install-recommends software-properties-common -y # 18.04 includes 2.17 but github requires 2.18+ to support submodules. #RUN add-apt-repository ppa:git-core/ppa -ADD .github/workflows/install_dependencies_run.sh install_dependencies_run.sh +ADD .github/workflows/install_dependencies_run_ubuntu22p04.sh install_dependencies_run.sh RUN bash install_dependencies_run.sh RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py RUN python3.8 get-pip.py && rm get-pip.py diff --git a/docker/Dockerfile.gcc-12 b/docker/Dockerfile.gcc-12 new file mode 100644 index 000000000..d21a8e1ed --- /dev/null +++ b/docker/Dockerfile.gcc-12 @@ -0,0 +1,2 @@ +FROM ghcr.io/lnis-uofu/openfpga-build-base +RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-12 g++-12 diff --git a/docker/Dockerfile.gcc-7 b/docker/Dockerfile.gcc-7 deleted file mode 100644 index d7638677b..000000000 --- a/docker/Dockerfile.gcc-7 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/lnis-uofu/openfpga-build-base -RUN apt-get update && apt-get install -y gcc-7 g++-7 diff --git a/docker/Dockerfile.gcc-8 b/docker/Dockerfile.gcc-8 deleted file mode 100644 index 187a47623..000000000 --- a/docker/Dockerfile.gcc-8 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/lnis-uofu/openfpga-build-base -RUN apt-get update && apt-get install -y gcc-8 g++-8