diff --git a/workspaces/alnoda-workspace/Dockerfile b/workspaces/alnoda-workspace/Dockerfile index 974d666..4fe46a9 100755 --- a/workspaces/alnoda-workspace/Dockerfile +++ b/workspaces/alnoda-workspace/Dockerfile @@ -33,6 +33,6 @@ COPY --chown=abc:abc filebrowser.json /home/abc/apps/filebrowser/.filebrowser.js # Build Alnoda workspace COPY --chown=abc:abc workspace /tmp/workspace RUN echo "------------------------------------------------------ build workspace" \ - && pipx install alnoda-wrk==0.3.34 \ + && pipx install alnoda-wrk==0.3.36 \ && alnoda-wrk build /tmp/workspace \ && rm -rf /tmp/workspace \ No newline at end of file diff --git a/workspaces/scala-workspace/Dockerfile b/workspaces/scala-workspace/Dockerfile index 99e7b50..36e5c93 100644 --- a/workspaces/scala-workspace/Dockerfile +++ b/workspaces/scala-workspace/Dockerfile @@ -24,7 +24,7 @@ ENV PATH="$PATH:/home/abc/.local/share/coursier/bin" USER abc RUN echo "------------------------------------------------------ coursier (user) " \ - && cs setup + && cs setup --yes diff --git a/workspaces/ubuntu-workspace/Dockerfile b/workspaces/ubuntu-workspace/Dockerfile index 827511e..b78cb5f 100644 --- a/workspaces/ubuntu-workspace/Dockerfile +++ b/workspaces/ubuntu-workspace/Dockerfile @@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update \ && chown abc /usr/bin/pip3.8 \ && echo "------------------------------------------------------ Allow users to install packages with apt" \ && echo "# Allow non-admin users to install packages" >> /etc/sudoers \ - && echo "abc ALL = NOPASSWD : /usr/bin/apt, /usr/bin/apt-get, /usr/bin/aptitude, /usr/bin/add-apt-repository, /usr/local/bin/pip, /usr/local/bin/systemctl, /usr/bin/dpkg, /usr/sbin/dpkg-reconfigure" >> /etc/sudoers \ + && echo "abc ALL = NOPASSWD : /usr/bin/apt, /usr/bin/apt-get, /usr/bin/apt-key, /usr/bin/aptitude, /usr/bin/add-apt-repository, /usr/local/bin/pip, /usr/local/bin/systemctl, /usr/bin/dpkg, /usr/sbin/dpkg-reconfigure" >> /etc/sudoers \ && chown abc /etc/apt/sources.list.d \ && chown abc /etc/apt/trusted.gpg.d \ && echo "------------------------------------------------------ GIT" \ @@ -46,11 +46,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update \ && echo "------------------------------------------------------ Nodeenv" \ && pip install nodeenv \ && apt-get install -y yarn \ - && echo "------------------------------------------------------ Node env with pm2" \ - && mkdir -p /home/abc/apps/node \ - && chown -R abc /home/abc/apps/ \ - && cd /home/abc/apps/node && nodeenv --node=18.9.0 env \ - && cd /home/abc/apps/node && . env/bin/activate && npm install -g pm2@5.2.0 \ && echo "------------------------------------------------------ Cron" \ && apt-get install -y cron \ && mkdir -p /var/log/supervisord/ \ @@ -149,7 +144,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update \ && echo "------------------------------------------------------ Aliases" \ && echo 'alias python="python3"' >> /root/.zshrc \ && echo 'alias python="python3"' >> /home/abc/.zshrc \ - && echo 'alias pm2="cd /home/abc/apps/node && . env/bin/activate && pm2"' >> /home/abc/.zshrc \ && echo 'alias lg="lazygit"' >> /home/abc/.zshrc \ && echo "------------------------------------------------------ Clean" \ && apt-get -y autoremove \