Skip to content

Commit 150f661

Browse files
authored
fix(installer): entrypoint get args from user (#1584)
1 parent a5b777f commit 150f661

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Diff for: build/docker/tools/tke-installer/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ ENV DOCKER_CLI_EXPERIMENTAL=enabled
2525
ARG ENV_ARCH
2626

2727
RUN apk add --no-cache \
28-
bash \
29-
busybox-extras \
30-
curl \
31-
tcpdump \
32-
docker \
33-
ansible
28+
bash \
29+
busybox-extras \
30+
curl \
31+
tcpdump \
32+
docker \
33+
ansible
3434

3535
RUN apk --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted add lrzsz
3636
RUN wget -O nerdctl-0.11.0-linux.tar.gz https://github.com/containerd/nerdctl/releases/download/v0.11.0/nerdctl-0.11.0-linux-"$ENV_ARCH".tar.gz \
37-
&& tar -zvxf nerdctl-0.11.0-linux.tar.gz -C /usr/local/bin/ \
38-
&& rm -rf nerdctl-0.11.0-linux.tar.gz
37+
&& tar -zvxf nerdctl-0.11.0-linux.tar.gz -C /usr/local/bin/ \
38+
&& rm -rf nerdctl-0.11.0-linux.tar.gz
3939

4040
ADD . /app
4141

4242
RUN ln -s /app/.docker /root/.docker
4343

44-
ENTRYPOINT ["/bin/sh", "-c" , "/app/run.sh"]
44+
ENTRYPOINT ["/app/run.sh"]

Diff for: build/docker/tools/tke-installer/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
# Tencent is pleased to support the open source community by making TKEStack
44
# available.
@@ -25,7 +25,7 @@ if [ $status -ne 0 ]; then
2525
fi
2626

2727
# Start the second process
28-
./bin/tke-installer
28+
./bin/tke-installer $@
2929
status=$?
3030
if [ $status -ne 0 ]; then
3131
echo "Failed to start my_second_process: $status"

0 commit comments

Comments
 (0)