diff --git a/Dockerfile b/Dockerfile index 9fb2b8f..beaae24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ RUN apt update \ RUN git clone https://github.com/c9/core.git /cloud9/c9sdk #RUN mkdir -p /cloud9/c9sdk/build /workspace/.ubuntu/.standalone #RUN ln -sf /workspace/.ubuntu/.standalone /cloud9/c9sdk/build/standalone -RUN /cloud9/c9sdk/scripts/install-sdk.sh +#RUN /cloud9/c9sdk/scripts/install-sdk.sh RUN cd /cloud9/c9sdk && git reset --hard RUN wget -O user-install.sh https://raw.githubusercontent.com/c9/install/master/install.sh && mv user-install.sh /cloud9/ @@ -182,10 +182,6 @@ RUN apt -y remove thunar # Copy files COPY rootfs / -# Extras -RUN apt -y install osmctools osmosis whiptail -RUN systemctl disable systemd-resolved - #RUN rm -rf /workspace/* RUN useradd -d /home/ubuntu -u 99 -G sudo -ms /bin/bash ubuntu diff --git a/rootfs/cloud9/apt-requirements.txt b/rootfs/cloud9/apt-requirements.txt index feb63d4..afb95c4 100644 --- a/rootfs/cloud9/apt-requirements.txt +++ b/rootfs/cloud9/apt-requirements.txt @@ -33,3 +33,9 @@ libreoffice pinta firefox #chrome? +ansible +terraform +golang +whiptail +osmctools +osmosis diff --git a/rootfs/etc/xdg/user-dirs.defaults b/rootfs/etc/xdg/user-dirs.defaults index 193abd5..695c211 100644 --- a/rootfs/etc/xdg/user-dirs.defaults +++ b/rootfs/etc/xdg/user-dirs.defaults @@ -5,7 +5,7 @@ DESKTOP=Desktop DOWNLOAD=Downloads #TEMPLATES=Workspace -PUBLICSHARE=Workspace/%FILE_SHARE% +#PUBLICSHARE=Workspace/%FILE_SHARE% DOCUMENTS=Workspace #MUSIC="$HOME" #PICTURES="$HOME" diff --git a/rootfs/startup.sh b/rootfs/startup.sh index b9042f8..7cf1579 100755 --- a/rootfs/startup.sh +++ b/rootfs/startup.sh @@ -161,5 +161,11 @@ if [ -n "$SEARCHDOMAIN" ]; then echo "search $SEARCHDOMAIN" >> /etc/resolv.conf fi +if [ -n "$AFTERINSTALL" ]; then + if [ -d "/etc/config" ]; then + bash /etc/config/$AFTERINSTALL + fi +fi + chown -R $USER:$USER /home/$USER exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf