Skip to content

Commit c3043e7

Browse files
gigiblendergigiblender
committed
[ci] Remove apt cache from the docker images
1 parent 52df2e8 commit c3043e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+122
-71
lines changed

‎docker/Dockerfile.ci_arm‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020

2121
FROM ubuntu:18.04
2222

23-
RUN apt-get update --fix-missing
24-
RUN apt-get install -y ca-certificates gnupg2
23+
RUN apt-get update --fix-missing \
24+
&& apt-get install -y ca-certificates gnupg2 \
25+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
2526

2627
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
2728
RUN bash /install/ubuntu_install_core.sh

‎docker/Dockerfile.ci_cpu‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
# CI docker CPU env
1919
FROM ubuntu:18.04
2020

21-
RUN apt-get update --fix-missing
22-
2321
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
2422
RUN bash /install/ubuntu_install_core.sh
2523

‎docker/Dockerfile.ci_gpu‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/
2525

2626
# Base scripts
2727
RUN rm /etc/apt/sources.list.d/nvidia-ml.list && apt-get clean
28-
RUN apt-get update --fix-missing
2928

3029
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
3130
RUN bash /install/ubuntu_install_core.sh
@@ -55,7 +54,9 @@ COPY install/ubuntu_install_sphinx.sh /install/ubuntu_install_sphinx.sh
5554
RUN bash /install/ubuntu_install_sphinx.sh
5655

5756
# Enable doxygen for c++ doc build
58-
RUN apt-get update && apt-get install -y doxygen libprotobuf-dev protobuf-compiler
57+
RUN apt-get update --fix-missing \
58+
&& apt-get install -y doxygen libprotobuf-dev protobuf-compiler \
59+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
5960

6061
COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh
6162
RUN bash /install/ubuntu_install_java.sh

‎docker/Dockerfile.ci_hexagon‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
# tag: v0.02
2020
FROM tvmcihexagon/ci-hexagon-base:v0.02_SDK4.5.0.3
2121

22-
RUN apt-get update --fix-missing
23-
RUN apt-get install -y ca-certificates gnupg2 libxml2-dev
22+
RUN apt-get update --fix-missing \
23+
&& apt-get install -y ca-certificates gnupg2 libxml2-dev \
24+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
2425

2526
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
2627
RUN bash /install/ubuntu_install_core.sh

‎docker/Dockerfile.ci_i386‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
FROM i386/ubuntu:18.04
2222

23-
RUN apt-get update --fix-missing && apt-get install -y ca-certificates
23+
RUN apt-get update --fix-missing \
24+
&& apt-get install -y ca-certificates \
25+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
2426

2527
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
2628
RUN bash /install/ubuntu_install_core.sh

‎docker/Dockerfile.ci_jekyll‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# tag: v0.50
2020
FROM ubuntu:16.04
2121

22-
RUN apt-get update && apt-get install -y sudo wget
23-
RUN apt-get update && apt-get install -y ruby-full build-essential zlib1g-dev
22+
RUN apt-get update --fix-missing \
23+
&& apt-get install -y sudo wget \
24+
&& apt-get install -y ruby-full build-essential zlib1g-dev \
25+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
2426
RUN gem install jekyll bundler

‎docker/Dockerfile.ci_lint‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@
2020
# tag: v0.60
2121
FROM ubuntu:18.04
2222

23-
RUN apt-get update --fix-missing
24-
25-
RUN apt-get update && apt-get install -y wget git sudo make parallel
23+
RUN apt-get update --fix-missing \
24+
&& apt-get install -y wget git sudo make parallel \
25+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
2626

2727
COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
2828
RUN bash /install/ubuntu1804_install_python.sh
2929

3030
# Globally disable pip cache
3131
RUN pip config set global.no-cache-dir false
3232

33-
RUN apt-get update && apt-get install -y doxygen graphviz curl shellcheck
33+
RUN apt-get update --fix-missing \
34+
&& apt-get install -y doxygen graphviz curl shellcheck \
35+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
3436

3537
RUN pip3 install cpplint pylint==2.4.4 mypy==0.902 black==22.3.0 flake8==3.9.2 blocklint==0.2.3 jinja2==3.0.3
3638

‎docker/Dockerfile.ci_qemu‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
# tag: v0.62
2020
FROM ubuntu:18.04
2121

22-
RUN apt-get update --fix-missing
23-
2422
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
2523
RUN bash /install/ubuntu_install_core.sh
2624

‎docker/Dockerfile.ci_wasm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
# under the License.
1717
FROM ubuntu:18.04
1818

19-
RUN apt-get update --fix-missing
20-
2119
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
2220
RUN bash /install/ubuntu_install_core.sh
2321

‎docker/Dockerfile.conda_cpu‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
FROM ubuntu:16.04
1919

20-
RUN apt-get update --fix-missing && apt-get install -y bzip2 wget sudo binutils git
20+
RUN apt-get update --fix-missing \
21+
&& apt-get install -y bzip2 wget sudo binutils git \
22+
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
2123

2224
COPY install/ubuntu_install_conda.sh /install/ubuntu_install_conda.sh
2325
RUN bash /install/ubuntu_install_conda.sh

0 commit comments

Comments
 (0)