diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-07-31 07:55:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 07:55:39 +0200 |
| commit | af0d6073fbf7a9e9841f15e1f261383e38ff9587 (patch) | |
| tree | 2aaad0fa08c9c5760da6591a070aa7e5cc08de45 /docker | |
| parent | 3154e512273970343f2b849b0185c427c7c5cf22 (diff) | |
| parent | 84a1957fb1e3765708b6333eecd25f2f5a02a896 (diff) | |
| download | vyos-build-af0d6073fbf7a9e9841f15e1f261383e38ff9587.tar.gz vyos-build-af0d6073fbf7a9e9841f15e1f261383e38ff9587.zip | |
Merge pull request #251 from c-po/t4515-equuleus
T4515: Reduce telegraf binary size (equuleus)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c2e09521..2a339720 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -358,9 +358,15 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ cd /tmp/libbpf && git checkout b91f53ec5f1aba2 && cd src && make install; \ fi -# Packages needed for vyos-xe-guest-utilities -RUN apt-get update && apt-get install -y \ - golang +# Go required for validators and vyos-xe-guest-utilities +RUN GO_VERSION_INSTALL="1.18.3" ; \ + if [ "$ARCH" = "arm64v8" ] ; then \ + wget -O /tmp/go${GO_VERSION_INSTALL}.linux-arm64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-arm64.tar.gz ; \ + else \ + wget -O /tmp/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz ; \ + fi && \ + tar -C /opt -xzf /tmp/go*.tar.gz && \ + rm /tmp/go*.tar.gz # Packages needed for ipaddrcheck RUN apt-get update && apt-get install -y \ @@ -590,8 +596,9 @@ RUN gem install --no-document fpm RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/gosu /usr/sbin/usermod -# Ensure sure all users have access to our OCAM installation -RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc +# Ensure sure all users have access to our OCAM and Go installation +RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \ + echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc # Cleanup RUN rm -rf /tmp/* |