diff options
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 2824bcb0..ddda5ff8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -87,7 +87,8 @@ RUN apt-get update && apt-get install -y \ gosu \ po4a \ openssh-client \ - jq + jq \ + socat # Packages needed for vyos-build RUN apt-get update && apt-get install -y \ @@ -153,7 +154,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#fc327ecd76 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#d7260e772e39bc6a3a2d76d629567e03bbad16b5 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ @@ -164,7 +165,7 @@ RUN apt-get update && apt-get install -y \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \ - cd /tmp/libvyosconfig && git checkout c6141d97 && \ + cd /tmp/libvyosconfig && git checkout 9e4f6c1494fcff64ad22503b704dbdd43347b0a6 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb @@ -269,8 +270,8 @@ RUN pip install --break-system-packages \ quilt \ whois -# Go required for validators and vyos-xe-guest-utilities -RUN GO_VERSION_INSTALL="1.21.3" ; \ +# Go required for telegraf and prometheus exporters build +RUN GO_VERSION_INSTALL="1.23.2" ; \ wget -O /tmp/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-$(dpkg-architecture -qDEB_HOST_ARCH).tar.gz ; \ tar -C /opt -xzf /tmp/go*.tar.gz && \ rm /tmp/go*.tar.gz @@ -384,6 +385,11 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \ echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc +# Rise upper limit for UID when working in an Active Direcotry integrated +# environment. This solves the warning: vyos_bld's uid 1632000007 outside of the +# UID_MIN 1000 and UID_MAX 60000 range. +RUN sed -i 's/UID_MAX\t\t\t60000/UID_MAX\t\t\t2000000000/g' /etc/login.defs + # Cleanup RUN rm -rf /tmp/* |