This is an automated email from the ASF dual-hosted git repository. mhamann pushed a commit to branch rclone-fix in repository https://gitbox.apache.org/repos/asf/openwhisk-apigateway.git
commit 2be646ef168d1e12f696df54739a6bb40687e201 Author: Matt Hamann <[email protected]> AuthorDate: Thu Aug 6 17:38:35 2020 -0400 fix(rclone): use official install mechanism --- Dockerfile | 2 +- build_config_supervisor.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce8d088..c37e5df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -250,7 +250,7 @@ RUN echo " ... installing cjose ... " \ ENV CONFIG_SUPERVISOR_VERSION 1.0.1-RC1 COPY build_config_supervisor.sh /tmp/build_config_supervisor.sh -RUN sh +x /tmp/build_config_supervisor.sh +RUN sh +x -e /tmp/build_config_supervisor.sh # Add standard gateway configuration FROM base as apigateway diff --git a/build_config_supervisor.sh b/build_config_supervisor.sh index 6bb01d2..f19ec6b 100644 --- a/build_config_supervisor.sh +++ b/build_config_supervisor.sh @@ -39,8 +39,12 @@ GOPATH=/tmp/go/vendor:/tmp/go-src CGO_ENABLED=0 GOOS=linux /usr/lib/go/bin/godep mv /tmp/go/api-gateway-config-supervisor /usr/local/sbin/ echo "installing rclone sync ... " -go get github.com/ncw/rclone -mv /usr/lib/go/bin/rclone /usr/local/sbin/ +mkdir -p /tmp/rclone +cd /tmp/rclone +curl -O https://downloads.rclone.org/rclone-current-linux-amd64.zip +unzip rclone-current-linux-amd64.zip +cd rclone-*-linux-amd64 +mv ./rclone /usr/local/sbin/ mkdir -p /root/.config/rclone/ cat <<EOF > /root/.config/rclone/rclone.conf [local] @@ -50,6 +54,7 @@ EOF echo " cleaning up ... " rm -rf /usr/lib/go/bin/src +rm -rf /tmp/rclone rm -rf /tmp/go rm -rf /tmp/go-src rm -rf /usr/lib/go/bin/pkg/
