From 1eceb5dd2180ab57e5b21be968206292bb825177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=A4=E6=9C=88?= <974226358@qq.com>
Date: Mon, 29 Jan 2024 20:19:44 +0800
Subject: [PATCH] [improve][docker] fix yaml and dockerfile (#4186)

Descriptions of the changes in this PR:
1. There are multiple spec.ports fields in sts yaml
2. The RUN command specified in dockerfile is not standardized

Master Issue: #4185
---
 deploy/kubernetes/gke/bookkeeper.statefulset.yml | 1 -
 tests/docker-images/statestore-image/Dockerfile  | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deploy/kubernetes/gke/bookkeeper.statefulset.yml b/deploy/kubernetes/gke/bookkeeper.statefulset.yml
index 49548f09d05..ca32b91137d 100644
--- a/deploy/kubernetes/gke/bookkeeper.statefulset.yml
+++ b/deploy/kubernetes/gke/bookkeeper.statefulset.yml
@@ -124,7 +124,6 @@ metadata:
     app: bookkeeper
     component: bookie
 spec:
-  ports:
   ports:
     - name: bookie
       port: 3181
diff --git a/tests/docker-images/statestore-image/Dockerfile b/tests/docker-images/statestore-image/Dockerfile
index 7605541188d..e89175be811 100644
--- a/tests/docker-images/statestore-image/Dockerfile
+++ b/tests/docker-images/statestore-image/Dockerfile
@@ -40,10 +40,10 @@ RUN set -x \
     && apt-get install -y --no-install-recommends python3 pip \
     && ln -s /usr/bin/python3 /usr/bin/python \
     && apt-get install -y --no-install-recommends gpg gpg-agent wget sudo \
-     && apt-get -y --purge autoremove \
-     && apt-get autoclean \
-     && apt-get clean \
-     && rm -rf /var/lib/apt/lists/*
+    && apt-get -y --purge autoremove \
+    && apt-get autoclean \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
     && pip install zk-shell \
     && mkdir -pv /opt \
     && cd /opt