diff --git a/.dockerignore b/.dockerignore index becc94088..8801107ae 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,30 +1,6 @@ -abc -ace2 -build -cmake -CMakeLists.txt -deploy_key.enc -docker -Dockerfile -docs -libopenfpga -libs -LICENSE -Makefile -openfpga -README.md -run_local.bat -run_local.sh -vpr -yosys +# Ignore everything +** -!abc/abc -!ace2/ace -!openfpga/openfpga -!vpr/vpr -!yosys/yosys -!yosys/yosys-abc -!yosys/yosys-config -!yosys/yosys-filterlib -!yosys/yosys-smtbmc -!yosys/share +# Allow files and directories +!/.github/** +!/*.* \ No newline at end of file diff --git a/.github/workflows/install_dependencies_run.sh b/.github/workflows/install_dependencies_run.sh index e6497d429..bbb9e22a3 100644 --- a/.github/workflows/install_dependencies_run.sh +++ b/.github/workflows/install_dependencies_run.sh @@ -1,2 +1,2 @@ -apt-get update && apt-get install -y libdatetime-perl iverilog python3-pip git \ +apt-get update && apt-get install --no-install-recommends -y libdatetime-perl iverilog python3-pip git \ libc6 libffi6 libgcc1 libreadline7 libstdc++6 libtcl8.6 python3 zlib1g libbz2-1.0 diff --git a/docker/Dockerfile.env b/docker/Dockerfile.env index d41ee6aeb..b0221231f 100644 --- a/docker/Dockerfile.env +++ b/docker/Dockerfile.env @@ -1,9 +1,9 @@ FROM ubuntu:18.04 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install 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. RUN add-apt-repository ppa:git-core/ppa ADD .github/workflows/install_dependencies_run.sh install_dependencies_run.sh RUN bash install_dependencies_run.sh ADD requirements.txt requirements.txt -RUN python3 -m pip install -r requirements.txt +RUN python3 -m pip install -r requirements.txt \ No newline at end of file