diff options
| author | zsdc <taras@vyos.io> | 2022-06-24 20:25:01 +0300 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-07-30 20:31:55 +0200 |
| commit | dc420a24d1ea70d09de518c9e7ed3c1c050c999a (patch) | |
| tree | 3d0f5e49245a0a36ab7a119c198b8d857d56debd /docker | |
| parent | 3154e512273970343f2b849b0185c427c7c5cf22 (diff) | |
| download | vyos-build-dc420a24d1ea70d09de518c9e7ed3c1c050c999a.tar.gz vyos-build-dc420a24d1ea70d09de518c9e7ed3c1c050c999a.zip | |
Go: T4472: Updated Go version to 1.18.3
* removed `golang-github-osrg-gobgp-dev` dependency from fastnetmon. It can be
built without it
* Replaced Go from the Debian repository (1.15) to a version from the Go
website (1.18.3)
(cherry picked from commit a6efbe1b628d82eb5dd55b0746cf9278a1f9a1c1)
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/* |