Skip to content

Commit a33a6d2

Browse files
committed
Docker: T5400: do not initialize OPAM environment at all
Instead of trying to fix - what we call - "Schroedingers build environment" in this container, we should rather fix the Makefiles of the individual project using OCaml code.
1 parent ab76eab commit a33a6d2

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

docker/Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2018-2024 VyOS maintainers and contributors
1+
# Copyright (C) 2018-2025 VyOS maintainers and contributors
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# in order to easy exprort images built to "external" world
@@ -367,9 +367,8 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
367367
echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
368368
chmod a+s /usr/sbin/useradd /usr/sbin/groupadd
369369

370-
# Ensure sure all users have access to our OCAM and Go installation
371-
RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc && \
372-
echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc
370+
# Ensure sure all users have access to Go
371+
RUN echo "export PATH=/opt/go/bin:\$PATH" >> /etc/skel/.bashrc
373372

374373
# Rise upper limit for UID when working in an Active Direcotry integrated
375374
# environment. This solves the warning: vyos_bld's uid 1632000007 outside of the

0 commit comments

Comments
 (0)