diff --git a/backend/scripts/start-dev b/backend/scripts/start-dev index a5ee744e0a..db8f1bdca7 100755 --- a/backend/scripts/start-dev +++ b/backend/scripts/start-dev @@ -2,10 +2,10 @@ set -e -if [ ! -e ~/local/.fixtures-loaded ]; then +if [ ! -e ~/.fixtures-loaded ]; then echo "Loading fixtures..." clojure -Adev -X:fn-fixtures - touch ~/local/.fixtures-loaded + touch ~/.fixtures-loaded fi clojure -m app.main diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 84c116e3d0..55beaa28ea 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -23,7 +23,6 @@ RUN set -ex; \ tmux \ vim \ curl \ - zsh \ bash \ git \ rlwrap \ @@ -93,14 +92,18 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - apt-get -qqy install postgresql-client-12 && \ rm -rf /var/lib/apt/lists/*; -COPY files/bashrc /root/.bashrc -COPY files/vimrc /root/.vimrc COPY files/phantomjs-mock /usr/bin/phantomjs +COPY files/bashrc /root/.bashrc +COPY files/vimrc /root/.vimrc +COPY files/tmux.conf /root/.tmux.conf +COPY files/start-tmux.sh /home/start-tmux.sh +COPY files/entrypoint.sh /home/entrypoint.sh +COPY files/init.sh /home/init.sh ARG EXTERNAL_UID=1000 RUN set -ex; \ - useradd -m -g users -s /bin/zsh -u $EXTERNAL_UID uxbox; \ + useradd -m -g users -s /bin/bash -u $EXTERNAL_UID uxbox; \ passwd uxbox -d; \ echo "uxbox ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers @@ -119,14 +122,6 @@ RUN set -ex; \ USER uxbox WORKDIR /home/uxbox -COPY files/bashrc /home/uxbox/.bashrc -COPY files/zshrc /home/uxbox/.zshrc -COPY files/vimrc /home/uxbox/.vimrc -COPY files/start-tmux.sh /home/uxbox/start-tmux.sh -COPY files/tmux.conf /home/uxbox/.tmux.conf -COPY files/entrypoint.sh /home/uxbox/ -COPY files/init.sh /home/uxbox/ - RUN set -ex; \ git clone https://github.com/creationix/nvm.git .nvm; \ bash -c "source .nvm/nvm.sh && nvm install $NODE_VERSION"; \ @@ -140,5 +135,5 @@ EXPOSE 3449 EXPOSE 6060 EXPOSE 9090 -ENTRYPOINT ["zsh", "/home/uxbox/entrypoint.sh"] -CMD ["/home/uxbox/init.sh"] +ENTRYPOINT ["bash", "/home/entrypoint.sh"] +CMD ["/home/init.sh"] diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index 94a056e223..b5289c666c 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -17,7 +17,6 @@ services: image: "uxbox-devenv" hostname: "uxbox-devenv-main" container_name: "uxbox-devenv-main" - command: "/home/uxbox/init.sh" stop_signal: SIGINT depends_on: @@ -26,8 +25,7 @@ services: - redis volumes: - - "user_data:/home/uxbox/local" - - "${HOME}/.m2:/home/uxbox/.m2" + - "user_data:/home/uxbox/" - "${PWD}:/home/uxbox/uxbox" - ./files/nginx.conf:/etc/nginx/nginx.conf diff --git a/docker/devenv/files/entrypoint.sh b/docker/devenv/files/entrypoint.sh old mode 100644 new mode 100755 index 2fe6b83679..53a27a077c --- a/docker/devenv/files/entrypoint.sh +++ b/docker/devenv/files/entrypoint.sh @@ -1,5 +1,13 @@ -#!/usr/bin/env zsh +#!/usr/bin/env bash + +source /home/uxbox/.bashrc -source /home/uxbox/.zshrc set -ex + +sudo cp /root/.bashrc /home/uxbox/.bashrc +sudo cp /root/.vimrc /home/uxbox/.vimrc +sudo cp /root/.tmux.conf /home/uxbox/.tmux.conf + +sudo chown uxbox:users /home/uxbox + exec "$@" diff --git a/docker/devenv/files/init.sh b/docker/devenv/files/init.sh index 2ecd72657f..0a5a754fb8 100755 --- a/docker/devenv/files/init.sh +++ b/docker/devenv/files/init.sh @@ -1,13 +1,10 @@ -#!/usr/bin/env zsh +#!/usr/bin/env bash set -e; -source ~/.zshrc +source ~/.bashrc echo "[init.sh] Start nginx." sudo nginx -echo "[init.sh] Setting up local permissions." -sudo chown -R uxbox /home/uxbox/local - echo "[init.sh] Ready!" tail -f /dev/null diff --git a/docker/devenv/files/start-tmux.sh b/docker/devenv/files/start-tmux.sh index 4945518e6e..db46596d39 100755 --- a/docker/devenv/files/start-tmux.sh +++ b/docker/devenv/files/start-tmux.sh @@ -1,7 +1,9 @@ -#!/usr/bin/env zsh +#!/usr/bin/env bash + +cd ~; set -e; -source ~/.zshrc +source ~/.bashrc echo "[start-tmux.sh] Installing node dependencies" pushd ~/uxbox/frontend/ diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index f595e8e3a6..ef893ddb8a 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -232,8 +232,10 @@ gulp.task("copy:assets:fonts", function() { gulp.task("copy:assets", gulp.parallel("copy:assets:images", "copy:assets:fonts")); -gulp.task("dev:dirs", function(next) { - mkdirp("./resources/public/css/").then(() => next()) +gulp.task("dev:dirs", async function(next) { + await mkdirp("./resources/public/css/"); + await mkdirp("./resources/public/js/"); + next(); }); gulp.task("watch:main", function() { diff --git a/manage.sh b/manage.sh index 04fdcaf0a2..0c9bee9efc 100755 --- a/manage.sh +++ b/manage.sh @@ -42,7 +42,7 @@ function run-devenv { start-devenv fi - docker exec -ti uxbox-devenv-main /home/uxbox/start-tmux.sh + docker exec -ti uxbox-devenv-main /home/start-tmux.sh } function build-frontend {