Changes between Version 24 and Version 25 of User Guide/Disk Images

Timestamp:

May 12, 2020, 2:28:35 AM (4 years ago)

Author:

msherman

Comment:

—

User Guide/Disk Images

@@ -164 +164 @@
 After saving an image, it will NOT track changes to the baseline, it is a copy, not a delta.
 
-You may periodically want to re-create your experimental images when a new baseline has been relased, to support new hardware, or newer drivers, etc.
-
-==== Baseline UHD
-Baseline UHD starts from Baseline, then installs UHD3.15 installed from source, and downloads the fpga images with uhd_images_downloader
+You may periodically want to re-create your experimental images when a new baseline has been released, to support new hardware, or newer drivers, etc.
 
 [[CollapsibleStart(Reference Dockerfile)]]
@@ -176 +173 @@
 
 RUN apt update && apt -y install \
-    ruby ruby-dev iw \
+    ruby ruby-dev iw
+
+#Install OMF6 RC
+
+#fix dependencies
+RUN gem install hashie:'~>2' facter:'~>2' omf_rc:'6.2.3'
+#manually patch omf_rc
+COPY files/omf/config.yml /var/lib/gems/2.5.0/gems/omf_rc-6.2.3/config/config.yml
+COPY files/omf/environment /var/lib/gems/2.5.0/gems/omf_rc-6.2.3/init/
+COPY files/omf/omf_rc.service /var/lib/gems/2.5.0/gems/omf_rc-6.2.3/init/
+COPY files/omf/install_omf_rc /usr/local/bin/install_omf_rc
+RUN install_omf_rc -i -c
+
+#copy misc files needed
+COPY files/blacklist/* /etc/modprobe.d/
+COPY files/prepare.sh /root/prepare.sh
+
+#clean up build
+RUN rm -f /etc/apt/apt.conf.d/01proxy && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt clean && \
+    apt autoclean
+}}}
+[[CollapsibleEnd]]
+
+==== Baseline UHD
+Baseline UHD starts from Baseline, then installs UHD3.15 installed from source, and downloads the fpga images with uhd_images_downloader
+
+[[CollapsibleStart(Reference Dockerfile)]]
+{{{#!dockerfile
+FROM container_baseline:latest as baseline-uhd
+ENV DEBIAN_FRONTEND=noninteractive \
+    TERM=linux
+
+RUN apt update && apt -y install \
     cmake \ 
     debhelper \ 
@@ -251 +282 @@
     echo "net.core.wmem_max=33554432" >> /etc/sysctl.conf
 
-#Install OMF6 RC
-
-#fix dependencies
-RUN gem install hashie:'~>2' facter:'~>2' omf_rc:'6.2.3'
-#manually patch omf_rc
-COPY files/omf/config.yml /var/lib/gems/2.5.0/gems/omf_rc-6.2.3/config/config.yml
-COPY files/omf/environment /var/lib/gems/2.5.0/gems/omf_rc-6.2.3/init/
-COPY files/omf/omf_rc.service /var/lib/gems/2.5.0/gems/omf_rc-6.2.3/init/
-COPY files/omf/install_omf_rc /usr/local/bin/install_omf_rc
-RUN install_omf_rc -i -c
-
-#copy misc files needed
-COPY files/blacklist/* /etc/modprobe.d/
-COPY files/prepare.sh /root/prepare.sh
-
 #clean up build
 RUN rm -f /etc/apt/apt.conf.d/01proxy && \
@@ -272 +288 @@
     apt autoclean
 }}}
-
 [[CollapsibleEnd]]
 
@@ -284 +299 @@
 
 {{{#!dockerfile
-FROM container_baseline:latest as baseline-gr38
+FROM container_baseline-uhd:latest as baseline-gr
 ENV DEBIAN_FRONTEND=noninteractive \
     TERM=linux
@@ -342 +357 @@
 ==== Baseline Tensorflow
 
+TODO
+
 ==== Baseline Pytorch
+
+TODO
 
 === Advanced