From a4102b0c8c0640a2261c825f6adcb80972dad98a Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 25 Jun 2019 20:19:14 -0400 Subject: [PATCH] move binary to /usr/bin --- Dockerfile | 5 ++--- root/etc/services.d/code-server/run | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c410870..da90a81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,6 @@ RUN \ git \ net-tools && \ echo "**** install code-server ****" && \ - mkdir -p \ - /opt/code-server && \ if [ -z ${CODE_RELEASE+x} ]; then \ CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -26,7 +24,8 @@ RUN \ /tmp/code.tar.gz -L \ "https://github.com/cdr/code-server/releases/download/${CODE_RELEASE}/code-server${CODE_RELEASE}-linux-x64.tar.gz" && \ tar xzf /tmp/code.tar.gz -C \ - /opt/code-server/ --strip-components=1 && \ + /usr/bin/ --strip-components=1 \ + --wildcards code-server*/code-server && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/root/etc/services.d/code-server/run b/root/etc/services.d/code-server/run index 4a45b11..7ac8ccf 100644 --- a/root/etc/services.d/code-server/run +++ b/root/etc/services.d/code-server/run @@ -11,7 +11,7 @@ fi exec \ s6-setuidgid abc \ - /opt/code-server/code-server \ + /usr/bin/code-server \ -H \ ${PASSARG} \ -d /config/data \