Commit c6c1da03 authored by Antoine Kaufmann's avatar Antoine Kaufmann Committed by Antoine Kaufmann
Browse files

docker: install qemu(-img) to /usr/bin

This makes it easier for images that build on ours to use tools like packer
without having to specify the full path
parent fb78d91c
...@@ -15,4 +15,10 @@ RUN git submodule update --init sims/external/ns-3 \ ...@@ -15,4 +15,10 @@ RUN git submodule update --init sims/external/ns-3 \
&& bash docker/cleanup_ns3.sh && bash docker/cleanup_ns3.sh
ENV PYTHONPATH=/simbricks/experiments ENV PYTHONPATH=/simbricks/experiments
RUN sudo cp docker/simbricks-run /usr/bin/ \ RUN sudo cp docker/simbricks-run /usr/bin/ \
&& sudo chmod 755 /usr/bin/simbricks-run && sudo chmod 755 /usr/bin/simbricks-run \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-system-x86_64 \
/usr/bin/qemu-system-x86_64 \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-system-x86_64 \
/usr/bin/kvm \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-img \
/usr/bin/qemu-img
...@@ -15,4 +15,10 @@ COPY --chown=${USERNAME}:${USERNAME} --from=builder /simbricks /simbricks ...@@ -15,4 +15,10 @@ COPY --chown=${USERNAME}:${USERNAME} --from=builder /simbricks /simbricks
WORKDIR /simbricks WORKDIR /simbricks
ENV PYTHONPATH=/simbricks/experiments ENV PYTHONPATH=/simbricks/experiments
RUN sudo cp docker/simbricks-run /usr/bin/ \ RUN sudo cp docker/simbricks-run /usr/bin/ \
&& sudo chmod 755 /usr/bin/simbricks-run && sudo chmod 755 /usr/bin/simbricks-run \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-system-x86_64 \
/usr/bin/qemu-system-x86_64 \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-system-x86_64 \
/usr/bin/kvm \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-img \
/usr/bin/qemu-img
...@@ -77,8 +77,13 @@ RUN make -j `nproc` build-images-min COMPRESSED_IMAGES=true \ ...@@ -77,8 +77,13 @@ RUN make -j `nproc` build-images-min COMPRESSED_IMAGES=true \
&& bash docker/cleanup_images.sh && bash docker/cleanup_images.sh
ENV PYTHONPATH=/simbricks/experiments ENV PYTHONPATH=/simbricks/experiments
RUN sudo cp docker/simbricks-run /usr/bin/ \ RUN sudo cp docker/simbricks-run /usr/bin/ \
&& sudo chmod 755 /usr/bin/simbricks-run && sudo chmod 755 /usr/bin/simbricks-run \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-system-x86_64 \
/usr/bin/qemu-system-x86_64 \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-system-x86_64 \
/usr/bin/kvm \
&& sudo ln -s /simbricks/sims/external/qemu/build/qemu-img \
/usr/bin/qemu-img
RUN mkdir /tofino RUN mkdir /tofino
COPY docker/bf-sde.tgz /tofino COPY docker/bf-sde.tgz /tofino
WORKDIR /tofino WORKDIR /tofino
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment