Revert "fix(dockerfiles/bases): shrink base image size" (#432)

Reverts #431
PingCAP-QE · Sep 23, 2024 · f092cd5 · f092cd5
1 parent 3c23267
commit f092cd5
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 33 deletions.
diff --git a/dockerfiles/bases/ng-monitoring-base/Dockerfile b/dockerfiles/bases/ng-monitoring-base/Dockerfile
@@ -1,5 +1,4 @@
 ARG PINGCAP_BASE
 FROM $PINGCAP_BASE
-RUN dnf install perl-interpreter -y \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install perl-interpreter -y && \
+ dnf clean all
diff --git a/dockerfiles/bases/ng-monitoring-base/release-6.5.Dockerfile b/dockerfiles/bases/ng-monitoring-base/release-6.5.Dockerfile
@@ -7,7 +7,7 @@ FROM pingcap/centos-stream:8 AS arm64
 RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo \
- && _date=20240920 dnf upgrade -y && dnf clean all && rm -rf /var/cache/yum \
+ && _date=20240919 dnf upgrade -y && dnf clean all \
  && sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo

diff --git a/dockerfiles/bases/pd-base/Dockerfile b/dockerfiles/bases/pd-base/Dockerfile
@@ -1,5 +1,4 @@
 ARG PINGCAP_BASE
 FROM $PINGCAP_BASE
-RUN dnf install bind-utils wget jq perl-interpreter -y \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install bind-utils wget jq perl-interpreter -y && \
+ dnf clean all
diff --git a/dockerfiles/bases/pd-base/release-6.5.Dockerfile b/dockerfiles/bases/pd-base/release-6.5.Dockerfile
@@ -8,7 +8,7 @@ FROM pingcap/centos-stream:8 AS arm64
 RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo \
- && _date=20240920 dnf upgrade -y && dnf clean all && rm -rf /var/cache/yum \
+ && _date=20240919 dnf upgrade -y && dnf clean all \
  && sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
diff --git a/dockerfiles/bases/pingcap-base/Dockerfile b/dockerfiles/bases/pingcap-base/Dockerfile
@@ -1,3 +1,3 @@
 FROM quay.io/rockylinux/rockylinux:9.4.20240523
 COPY --from=busybox:1.36.1 /bin/busybox /bin/busybox
-RUN _date=20240920 dnf upgrade -y && dnf clean all && rm -rf /var/cache/yum
+RUN _date=20240730 dnf upgrade -y && dnf clean all
diff --git a/dockerfiles/bases/skaffold.yaml b/dockerfiles/bases/skaffold.yaml
@@ -60,7 +60,7 @@ build:
  cache: {}
  tagPolicy:
  customTemplate:
- template: "v1.9.2"
+ template: "v1.9.1"
  cluster:
  concurrency: 0
  randomDockerConfigSecret: false
@@ -118,7 +118,7 @@ build:
  cache: {}
  tagPolicy:
  customTemplate:
- template: "v1.9.2-fips"
+ template: "v1.9.1-fips"
  cluster:
  concurrency: 0
  randomDockerConfigSecret: false
@@ -202,7 +202,7 @@ build:
  path: tools-base/release-6.5.Dockerfile
  tagPolicy:
  customTemplate:
- template: "v1.0.2-old"
+ template: "v1.0.1-old"
  local:
  useDockerCLI: true
  useBuildkit: true

diff --git a/dockerfiles/bases/tidb-base/Dockerfile b/dockerfiles/bases/tidb-base/Dockerfile
@@ -1,5 +1,3 @@
 ARG PINGCAP_BASE
 FROM $PINGCAP_BASE
-RUN dnf install --allowerasing -y curl wget \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install --allowerasing -y curl wget && dnf clean all
diff --git a/dockerfiles/bases/tidb-base/release-6.5.Dockerfile b/dockerfiles/bases/tidb-base/release-6.5.Dockerfile
@@ -8,11 +8,10 @@ FROM pingcap/centos-stream:8 AS arm64
 RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo \
- && _date=20240920 dnf upgrade -y && dnf clean all && rm -rf /var/cache/yum \
+ && _date=20240919 dnf upgrade -y && dnf clean all \
  && sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
 RUN set -e && \
- dnf install bind-utils curl nmap-ncat -y \
- && dnf clean all \
- && rm -rf /var/cache/yum
+ dnf install bind-utils curl nmap-ncat -y && \
+ dnf clean all
diff --git a/dockerfiles/bases/tiflash-base/Dockerfile b/dockerfiles/bases/tiflash-base/Dockerfile
@@ -1,5 +1,3 @@
 ARG PINGCAP_BASE
 FROM $PINGCAP_BASE
-RUN dnf install --allowerasing -y wget \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install --allowerasing -y wget && dnf clean all
diff --git a/dockerfiles/bases/tikv-base/Dockerfile b/dockerfiles/bases/tikv-base/Dockerfile
@@ -1,8 +1,6 @@
 ARG PINGCAP_BASE
 FROM $PINGCAP_BASE
 # wget is requested by operator
-RUN dnf install -y tzdata wget \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install -y tzdata wget && dnf clean all
 ENV TZ=/etc/localtime \
  TZDIR=/usr/share/zoneinfo
diff --git a/dockerfiles/bases/tikv-base/fips.Dockerfile b/dockerfiles/bases/tikv-base/fips.Dockerfile
@@ -1,8 +1,6 @@
 ARG PINGCAP_BASE=ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.1
 FROM $PINGCAP_BASE
 # wget is requested by operator
-RUN dnf install -y tzdata wget openssl \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install -y tzdata wget openssl && dnf clean all
 ENV TZ=/etc/localtime \
  TZDIR=/usr/share/zoneinfo
diff --git a/dockerfiles/bases/tikv-base/release-6.5.Dockerfile b/dockerfiles/bases/tikv-base/release-6.5.Dockerfile
@@ -10,7 +10,7 @@ FROM pingcap/centos-stream:8 AS arm64
 RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo \
- && _date=20240920 dnf upgrade -y && dnf clean all && rm -rf /var/cache/yum \
+ && _date=20240919 dnf upgrade -y && dnf clean all \
  && sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo

diff --git a/dockerfiles/bases/tools-base/Dockerfile b/dockerfiles/bases/tools-base/Dockerfile
@@ -1,5 +1,3 @@
 ARG PINGCAP_BASE
 FROM $PINGCAP_BASE
-RUN dnf install -y bind-utils wget nc \
- && dnf clean all \
- && rm -rf /var/cache/yum
+RUN dnf install -y bind-utils wget nc && dnf clean all
diff --git a/dockerfiles/bases/tools-base/release-6.5.Dockerfile b/dockerfiles/bases/tools-base/release-6.5.Dockerfile
@@ -8,7 +8,7 @@ FROM pingcap/centos-stream:8 AS arm64
 RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo \
- && _date=20240920 dnf upgrade -y && dnf clean all && rm -rf /var/cache/yum \
+ && _date=20240919 dnf upgrade -y && dnf clean all \
  && sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \
  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo \
  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo