update ssh install

PaddlePaddle · Jun 30, 2022 · 5f3cf61 · 5f3cf61
1 parent ac8c30c
commit 5f3cf61
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 17 deletions.
diff --git a/tekton/dockerfiles/Dockerfile.clas b/tekton/dockerfiles/Dockerfile.clas
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A

diff --git a/tekton/dockerfiles/Dockerfile.detection b/tekton/dockerfiles/Dockerfile.detection
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-    apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A

diff --git a/tekton/dockerfiles/Dockerfile.helix b/tekton/dockerfiles/Dockerfile.helix
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A

diff --git a/tekton/dockerfiles/Dockerfile.nlp b/tekton/dockerfiles/Dockerfile.nlp
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A

diff --git a/tekton/dockerfiles/Dockerfile.rec b/tekton/dockerfiles/Dockerfile.rec
@@ -9,15 +9,16 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A
-
 # add tini
 # ENV TINI_VERSION v0.19.0
 # ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini

diff --git a/tekton/dockerfiles/Dockerfile.science b/tekton/dockerfiles/Dockerfile.science
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A

diff --git a/tekton/dockerfiles/Dockerfile.seg b/tekton/dockerfiles/Dockerfile.seg
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A

diff --git a/tekton/dockerfiles/Dockerfile.speech b/tekton/dockerfiles/Dockerfile.speech
@@ -9,11 +9,13 @@ COPY ./Resource/sources.list /etc/apt/
 COPY ./Resource/trusted.gpg /etc/apt/
 COPY ./Resource/trusted.gpg.d /etc/apt/trusted.gpg.d
 RUN apt-get update
+
+RUN mkdir -p /var/run/sshd /root/.ssh
 RUN /usr/sbin/sshd -p 22; if [ $? -ne 0 ]; then \
-apt-get install -y openssh-server; fi
+    rm -rf /etc/ssh/sshd_config && apt-get install \
+    -y openssh-server; fi
 
 # disable UseDNS
-RUN mkdir -p /var/run/sshd /root/.ssh
 RUN sed -i "s/#UseDNS .*/UseDNS no/" /etc/ssh/sshd_config
 RUN sed -i -r "s/^(.*pam_nologin.so)/#\1/" /etc/pam.d/sshd
 RUN ssh-keygen -A