Skip to content

Commit d958283

Browse files
authored
Remove ssh for cloudshell (#49)
1 parent 7c55bf6 commit d958283

File tree

7 files changed

+47
-41
lines changed

7 files changed

+47
-41
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v1.2.7
2+
3+
## Bugfix:
4+
- Remove ssh for cloudshell
5+
## Dependency:
6+
- kubecube 1.4.0
7+
18
# v1.2.6
29
2022-12-29
310
## Bugfix:

cloudshell/Makefile

Lines changed: 0 additions & 16 deletions
This file was deleted.

cloudshell/amd64/Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22
# Use of this source code is governed by a Apache license
33
# that can be found in the LICENSE file.
44

5-
FROM hub.c.163.com/kubecube/ubuntu:16.04-tools
6-
COPY ./amd64/kubecube-chroot.sh /kubecube-chroot.sh
7-
COPY ./amd64/kubectl /bin/kubectl
8-
RUN chmod +x /kubecube-chroot.sh
5+
FROM hub.c.163.com/kubecube/ubuntu:16.04
6+
7+
RUN apt-get update \
8+
&& apt-get update && apt-get install -y vim tar wget curl rsync bzip2 iptables tcpdump less telnet net-tools lsof sysstat cron supervisor inetutils-ping \
9+
&& rm -rf /var/lib/apt/lists/*
10+
11+
COPY ./cloudshell/amd64/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
12+
COPY ./cloudshell/amd64/kubecube-chroot.sh /kubecube-chroot.sh
13+
COPY ./cloudshell/amd64/kubectl /bin/kubectl
14+
RUN chmod +x /kubecube-chroot.sh
15+
16+
CMD ["/usr/bin/supervisord"]

cloudshell/base/sshd.conf renamed to cloudshell/amd64/supervisord.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44

55
[supervisord]
66
nodaemon=true
7-
[program:sshd]
8-
command=/usr/sbin/sshd -D
7+
[program:keepalive]
8+
command=tail -f /dev/null
9+
autostart=true
10+
autorestart=true
11+
redirect_stderr=true

cloudshell/arm64/Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22
# Use of this source code is governed by a Apache license
33
# that can be found in the LICENSE file.
44

5-
FROM hub.c.163.com/kubecube/ubuntu:16.04-tools
6-
COPY ./arm64/kubecube-chroot.sh /kubecube-chroot.sh
7-
COPY ./arm64/kubectl /bin/kubectl
8-
RUN chmod +x /kubecube-chroot.sh
5+
FROM hub.c.163.com/kubecube/ubuntu:16.04
6+
7+
RUN apt-get update \
8+
&& apt-get update && apt-get install -y vim tar wget curl rsync bzip2 iptables tcpdump less telnet net-tools lsof sysstat cron supervisor inetutils-ping \
9+
&& rm -rf /var/lib/apt/lists/*
10+
11+
COPY ./cloudshell/arm64/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
12+
COPY ./cloudshell/arm64/kubecube-chroot.sh /kubecube-chroot.sh
13+
COPY ./cloudshell/arm64/kubectl /bin/kubectl
14+
RUN chmod +x /kubecube-chroot.sh
15+
16+
CMD ["/usr/bin/supervisord"]

cloudshell/arm64/supervisord.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright 2021 The KubeCube Authors. All rights reserved.
2+
# Use of this source code is governed by a Apache license
3+
# that can be found in the LICENSE file.
4+
5+
[supervisord]
6+
nodaemon=true
7+
[program:keepalive]
8+
command=tail -f /dev/null
9+
autostart=true
10+
autorestart=true
11+
redirect_stderr=true

cloudshell/base/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)