diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-03-15 21:13:23 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-03-15 21:13:25 +0100 |
| commit | a33a6d277007c2574c9fb6006eb0d20981e5fefe (patch) | |
| tree | 1e798b2b4e4ed2520fe404fd73f62325c91cd5f3 /docker | |
| parent | ab76eab0025cba5f98548d53faa8cb5cc948a17f (diff) | |
| download | vyos-build-a33a6d277007c2574c9fb6006eb0d20981e5fefe.tar.gz vyos-build-a33a6d277007c2574c9fb6006eb0d20981e5fefe.zip | |
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.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ca70c5bf..a1553737 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2024 VyOS maintainers and contributors +# Copyright (C) 2018-2025 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # 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 && \ echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ chmod a+s /usr/sbin/useradd /usr/sbin/groupadd -# 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 +# Ensure sure all users have access to Go +RUN 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 |