[docker] now move to ubuntu 22.04
This commit is contained in:
parent
8baa53c605
commit
45dda1ed57
|
@ -1,9 +1,9 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:22.04
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
RUN apt-get update && apt-get install software-properties-common -y
|
RUN apt-get update && apt-get install software-properties-common -y
|
||||||
# 18.04 includes 2.17 but github requires 2.18+ to support submodules.
|
# 18.04 includes 2.17 but github requires 2.18+ to support submodules.
|
||||||
RUN add-apt-repository ppa:git-core/ppa
|
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
|
RUN bash install_dependencies_build.sh
|
||||||
ADD requirements.txt requirements.txt
|
ADD requirements.txt requirements.txt
|
||||||
RUN python3 -m pip install -r requirements.txt
|
RUN python3 -m pip install -r requirements.txt
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -1,9 +1,9 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:22.04
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
RUN apt-get update && apt-get install --no-install-recommends software-properties-common -y
|
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.
|
# 18.04 includes 2.17 but github requires 2.18+ to support submodules.
|
||||||
#RUN add-apt-repository ppa:git-core/ppa
|
#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 bash install_dependencies_run.sh
|
||||||
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
|
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
|
||||||
RUN python3.8 get-pip.py && rm get-pip.py
|
RUN python3.8 get-pip.py && rm get-pip.py
|
||||||
|
|
|
@ -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
|
|
@ -1,2 +0,0 @@
|
||||||
FROM ghcr.io/lnis-uofu/openfpga-build-base
|
|
||||||
RUN apt-get update && apt-get install -y gcc-7 g++-7
|
|
|
@ -1,2 +0,0 @@
|
||||||
FROM ghcr.io/lnis-uofu/openfpga-build-base
|
|
||||||
RUN apt-get update && apt-get install -y gcc-8 g++-8
|
|
Loading…
Reference in New Issue