vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Go: T4472: Updated Go version to 1.18.3

Browse Source 
* 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)
This commit is contained in:
zsdc 2022-06-24 20:25:01 +03:00
parent a476b7f9f5
commit a6efbe1b62
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/Dockerfile
View File

@ -352,9 +352,15 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
cd /tmp/libbpf && git checkout b91f53ec5f1aba2 && cd src && make install; \ cd /tmp/libbpf && git checkout b91f53ec5f1aba2 && cd src && make install; \
fi fi
# Packages needed for vyos-xe-guest-utilities # Go required for validators and vyos-xe-guest-utilities
RUN apt-get update && apt-get install -y \ RUN GO_VERSION_INSTALL="1.18.3" ; \
golang 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 # Packages needed for ipaddrcheck
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@ -545,7 +551,6 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
protobuf-compiler \ protobuf-compiler \
protobuf-compiler-grpc \ protobuf-compiler-grpc \
capnproto \ capnproto \
golang-github-osrg-gobgp-dev \
libhiredis-dev \ libhiredis-dev \
libjson-c-dev \ libjson-c-dev \
liblog4cpp5-dev \ liblog4cpp5-dev \
@ -571,8 +576,9 @@ RUN gem install --no-document fpm
RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ 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 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 # Ensure sure all users have access to our OCAM and Go installation
RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \
echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc
# Cleanup # Cleanup
RUN rm -rf /tmp/* RUN rm -rf /tmp/*