From ba5a439ff3dae03fc1b98df0a23487ce62049122 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 2 Apr 2021 23:28:08 -0700 Subject: [PATCH] fix broken build see issue #53 --- autolib/docker.sh | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/autolib/docker.sh b/autolib/docker.sh index 7f78d83..58ae201 100644 --- a/autolib/docker.sh +++ b/autolib/docker.sh @@ -21,14 +21,13 @@ RUN set -x && \ cp /opt/cmake-3.14.5-Linux-x86_64/bin/* /usr/local/bin/ && \ cp -R /opt/cmake-3.14.5-Linux-x86_64/share/cmake-3.14 /usr/local/share/ && \ curl -sL https://dl.google.com/go/go1.13.1.linux-amd64.tar.gz 2> /dev/null | tar xzf - -C /usr/local && \ - mkdir -p /gopath/{src,bin} && \ - printf 'export GOPATH=/gopath\nexport PATH=$PATH:/usr/local/go/bin:/gopath/bin\n' > /root/.bash_profile && \ + printf 'export PATH=$PATH:/usr/local/go/bin:/root/go/bin\n' > /root/.bash_profile && \ printf '#!/usr/bin/env bash\nsource /root/.bash_profile\nexec /bin/bash $@\n' > /entrypoint && \ chmod +x /entrypoint && \ - GOPATH=/gopath /usr/local/go/bin/go get github.com/prometheus/prom2json && \ - GOPATH=/gopath /usr/local/go/bin/go install github.com/prometheus/prom2json/cmd/prom2json && \ - GOPATH=/gopath /usr/local/go/bin/go get github.com/git-chglog/git-chglog && \ - GOPATH=/gopath /usr/local/go/bin/go install github.com/git-chglog/git-chglog/cmd/git-chglog && \ + /usr/local/go/bin/go get github.com/prometheus/prom2json/cmd/prom2json && \ + /usr/local/go/bin/go get github.com/git-chglog/git-chglog/cmd/git-chglog && \ + /usr/local/go/bin/go install -i github.com/prometheus/prom2json/cmd/prom2json && \ + /usr/local/go/bin/go install -i github.com/git-chglog/git-chglog/cmd/git-chglog && \ rm -rf /var/lib/apt/lists/* WORKDIR /code @@ -51,14 +50,13 @@ RUN set -x && \ cp /opt/cmake-3.14.5-Linux-x86_64/bin/* /usr/local/bin/ && \ cp -R /opt/cmake-3.14.5-Linux-x86_64/share/cmake-3.14 /usr/local/share/ && \ curl -sL https://dl.google.com/go/go1.13.1.linux-amd64.tar.gz 2> /dev/null | tar xzf - -C /usr/local && \ - mkdir -p /gopath/{src,bin} && \ - printf 'export GOPATH=/gopath\nexport PATH=$PATH:/usr/local/go/bin:/gopath/bin\n' > /root/.bash_profile && \ + printf 'export PATH=$PATH:/usr/local/go/bin:/root/go/bin\n' > /root/.bash_profile && \ printf '#!/usr/bin/env bash\nsource /root/.bash_profile\nexec /bin/bash $@\n' > /entrypoint && \ chmod +x /entrypoint && \ - GOPATH=/gopath /usr/local/go/bin/go get github.com/prometheus/prom2json && \ - GOPATH=/gopath /usr/local/go/bin/go install github.com/prometheus/prom2json/cmd/prom2json && \ - GOPATH=/gopath /usr/local/go/bin/go get github.com/git-chglog/git-chglog && \ - GOPATH=/gopath /usr/local/go/bin/go install github.com/git-chglog/git-chglog/cmd/git-chglog && \ + /usr/local/go/bin/go get github.com/prometheus/prom2json/cmd/prom2json && \ + /usr/local/go/bin/go get github.com/git-chglog/git-chglog/cmd/git-chglog && \ + /usr/local/go/bin/go install -i github.com/prometheus/prom2json/cmd/prom2json && \ + /usr/local/go/bin/go install -i github.com/git-chglog/git-chglog/cmd/git-chglog && \ rm -rf /var/lib/apt/lists/* WORKDIR /code @@ -81,14 +79,13 @@ RUN set -x && \ cp /opt/cmake-3.14.5-Linux-x86_64/bin/* /usr/local/bin/ && \ cp -R /opt/cmake-3.14.5-Linux-x86_64/share/cmake-3.14 /usr/local/share/ && \ curl -sL https://dl.google.com/go/go1.13.1.linux-amd64.tar.gz 2> /dev/null | tar xzf - -C /usr/local && \ - mkdir -p /gopath/{src,bin} && \ - printf 'export GOPATH=/gopath\nexport PATH=$PATH:/usr/local/go/bin:/gopath/bin\n' > /root/.bash_profile && \ + printf 'export PATH=$PATH:/usr/local/go/bin:/root/go/bin\n' > /root/.bash_profile && \ printf '#!/usr/bin/env bash\nsource /root/.bash_profile\nexec /bin/bash $@\n' > /entrypoint && \ chmod +x /entrypoint && \ - GOPATH=/gopath /usr/local/go/bin/go get github.com/prometheus/prom2json && \ - GOPATH=/gopath /usr/local/go/bin/go install github.com/prometheus/prom2json/cmd/prom2json && \ - GOPATH=/gopath /usr/local/go/bin/go get github.com/git-chglog/git-chglog && \ - GOPATH=/gopath /usr/local/go/bin/go install github.com/git-chglog/git-chglog/cmd/git-chglog && \ + /usr/local/go/bin/go get github.com/prometheus/prom2json/cmd/prom2json && \ + /usr/local/go/bin/go get github.com/git-chglog/git-chglog/cmd/git-chglog && \ + /usr/local/go/bin/go install -i github.com/prometheus/prom2json/cmd/prom2json && \ + /usr/local/go/bin/go install -i github.com/git-chglog/git-chglog/cmd/git-chglog && \ rm -rf /var/lib/apt/lists/* WORKDIR /code @@ -129,4 +126,4 @@ autolib_write_dockerfile(){ return $r } ;; esac -} \ No newline at end of file +}