diff --git a/Dockerfile b/Dockerfile index 20f0b25..a4cd492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -181,11 +181,6 @@ RUN apt -y remove thunar COPY rootfs / # Extras -RUN tar xvfz /etc/osmosis/osmosis-0.48.3.tgz --directory /etc/osmosis -RUN tar xvfz /etc/osmosis/osmosis-0.48.3.tgz --directory /etc/osmosis -RUN chmod a+x /etc/osmosis/bin/osmosis -RUN ln -sf /etc/osmosis/bin/osmosis /bin - -RUN apt -y install osmctools +RUN apt -y install osmctools osmosis #RUN rm -rf /workspace/* diff --git a/rootfs/etc/osmosis/osmosis-0.48.3.tgz b/rootfs/etc/osmosis/osmosis-0.48.3.tgz deleted file mode 100644 index 727db3d..0000000 Binary files a/rootfs/etc/osmosis/osmosis-0.48.3.tgz and /dev/null differ diff --git a/rootfs/startup.sh b/rootfs/startup.sh index 27d8bc4..860be7a 100755 --- a/rootfs/startup.sh +++ b/rootfs/startup.sh @@ -25,6 +25,9 @@ if [ -n "$TZ" ]; then dpkg-reconfigure --frontend noninteractive tzdata fi +if [ -n "$FILE_SHARE" ]; then + FILE_SHARE=_SHARED_FILES_ +fi #sed -i "s#/usr/share/backgrounds.*#/usr/share/backgrounds/default.png\"/>#g" /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -119,9 +122,9 @@ fi bash /cloud9/configure_desktop.sh & -mkdir -p /home/$USER/Workspace/_Shared_Files_ +mkdir -p /home/$USER/Workspace/$FILE_SHARE grep -qxF "/home/$USER/Workspace /workspace none defaults,bind 0 0" /etc/fstab || echo "/home/$USER/Workspace /workspace none defaults,bind 0 0" >> /etc/fstab -grep -qxF "/home/$USER/Workspace/_Shared_Files_ /workspace/_Shared_Files_ none defaults,bind 0 0" /etc/fstab || echo "/home/$USER/Workspace/_Shared_Files_ /workspace/_Shared_Files_ none defaults,bind 0 0" >> /etc/fstab +grep -qxF "/home/$USER/Workspace/_Shared_Files_ /workspace/$FILE_SHARE none defaults,bind 0 0" /etc/fstab || echo "/home/$USER/Workspace/$FILE_SHARE /workspace/$FILE_SHARE none defaults,bind 0 0" >> /etc/fstab mount -a # Make directory for bookmarks @@ -130,7 +133,7 @@ mkdir -p /home/$USER/.config/gtk-3.0 # Keep these bookmarks #grep "Documents" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Documents" >> /home/$USER/.config/gtk-3.0/bookmarks grep "Workspace" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace" >> /home/$USER/.config/gtk-3.0/bookmarks -grep "_Shared_Files_" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace/_Shared_Files_" >> /home/$USER/.config/gtk-3.0/bookmarks +grep "$FILE_SHARE" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Workspace/$FILE_SHARE" >> /home/$USER/.config/gtk-3.0/bookmarks grep "Downloads" /home/$USER/.config/gtk-3.0/bookmarks || echo "file:///home/$USER/Downloads" >> /home/$USER/.config/gtk-3.0/bookmarks # Duke.edu repo is down 8/18/2020