From 3e0b0ee069020abbeffbdb4482e53255ce647604 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 21 Sep 2020 16:02:37 +0200 Subject: [PATCH] :arrow_up: Update dependencies and devenv. --- backend/deps.edn | 7 +-- backend/scripts/repl | 2 +- backend/scripts/start-dev | 4 +- docker/devenv/Dockerfile | 51 +++++++++--------- docker/devenv/docker-compose.yaml | 4 +- frontend/deps.edn | 2 +- frontend/yarn.lock | 88 +++++++++++++++---------------- manage.sh | 8 +-- 8 files changed, 81 insertions(+), 85 deletions(-) diff --git a/backend/deps.edn b/backend/deps.edn index 79575ad0d..f40ec078b 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -28,9 +28,9 @@ java-http-clj/java-http-clj {:mvn/version "0.4.1"} info.sunng/ring-jetty9-adapter {:mvn/version "0.14.0"} - seancorfield/next.jdbc {:mvn/version "1.1.582"} + seancorfield/next.jdbc {:mvn/version "1.1.588"} metosin/reitit-ring {:mvn/version "0.5.5"} - org.postgresql/postgresql {:mvn/version "42.2.15"} + org.postgresql/postgresql {:mvn/version "42.2.16"} com.zaxxer/HikariCP {:mvn/version "3.4.5"} funcool/datoteka {:mvn/version "1.2.0"} @@ -40,6 +40,7 @@ buddy/buddy-core {:mvn/version "1.8.0"} buddy/buddy-hashers {:mvn/version "1.6.0"} + buddy/buddy-sign {:mvn/version "3.2.0"} lambdaisland/uri {:mvn/version "1.4.54" :exclusions [org.clojure/data.json]} @@ -50,7 +51,7 @@ org.im4java/im4java {:mvn/version "1.4.0"} org.lz4/lz4-java {:mvn/version "1.7.1"} com.github.spullara.mustache.java/compiler {:mvn/version "0.9.6"} - commons-io/commons-io {:mvn/version "2.7"} + commons-io/commons-io {:mvn/version "2.8.0"} com.draines/postal {:mvn/version "2.0.3" :exclusions [commons-codec/commons-codec]} diff --git a/backend/scripts/repl b/backend/scripts/repl index 7e224a50d..e47920612 100755 --- a/backend/scripts/repl +++ b/backend/scripts/repl @@ -3,4 +3,4 @@ set -ex # clojure -Ojmx-remote -A:dev -e "(set! *warn-on-reflection* true)" -m rebel-readline.main # clojure -Ojmx-remote -A:dev -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseZGC -J-Xms128m -J-Xmx128m -m rebel-readline.main -clojure -Ojmx-remote -A:dev -J-Xms128m -J-Xmx128m -m rebel-readline.main +clojure -A:jmx-remote:dev -J-Xms128m -J-Xmx128m -M -m rebel-readline.main diff --git a/backend/scripts/start-dev b/backend/scripts/start-dev index db8f1bdca..82baf904b 100755 --- a/backend/scripts/start-dev +++ b/backend/scripts/start-dev @@ -1,6 +1,6 @@ #!/bin/sh -set -e +set -ex if [ ! -e ~/.fixtures-loaded ]; then echo "Loading fixtures..." @@ -8,6 +8,6 @@ if [ ! -e ~/.fixtures-loaded ]; then touch ~/.fixtures-loaded fi -clojure -m app.main +clojure -M -m app.main diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 55beaa28e..72bf68956 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -2,9 +2,10 @@ FROM debian:buster LABEL maintainer="Andrey Antukh " ARG DEBIAN_FRONTEND=noninteractive +ARG EXTERNAL_UID=1000 -ENV NODE_VERSION=v12.18.3 \ - CLOJURE_VERSION=1.10.1.641 \ +ENV NODE_VERSION=v12.18.4 \ + CLOJURE_VERSION=1.10.1.681 \ LANG=en_US.UTF-8 \ LC_ALL=C.UTF-8 @@ -78,30 +79,26 @@ RUN set -ex; \ ; \ rm -rf /var/lib/apt/lists/*; -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 && \ - echo "deb http://repos.azulsystems.com/debian stable main" >> /etc/apt/sources.list.d/zulu.list && \ - apt-get -qq update && \ - apt-get -qqy install zulu-14 && \ - rm -rf /var/lib/apt/lists/*; +RUN set -ex; \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9; \ + echo "deb http://repos.azulsystems.com/debian stable main" >> /etc/apt/sources.list.d/zulu.list; \ + apt-get -qq update; \ + apt-get -qqy install zulu-14; \ + rm -rf /var/lib/apt/lists/*; \ + wget "https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh"; \ + chmod +x "linux-install-$CLOJURE_VERSION.sh"; \ + "./linux-install-$CLOJURE_VERSION.sh"; \ + rm -rf "linux-install-$CLOJURE_VERSION.sh" ENV JAVA_HOME=/usr/lib/jvm/zulu-14-amd64 -RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - && \ - echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" >> /etc/apt/sources.list.d/postgresql.list && \ - apt-get -qq update && \ - apt-get -qqy install postgresql-client-12 && \ +RUN set -ex; \ + curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -; \ + echo "deb http://apt.postgresql.org/pub/repos/apt buster-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \ + apt-get -qq update; \ + apt-get -qqy install postgresql-client-12; \ rm -rf /var/lib/apt/lists/*; -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/bash -u $EXTERNAL_UID uxbox; \ passwd uxbox -d; \ @@ -113,11 +110,13 @@ RUN set -ex; \ mv svgcleaner /usr/local/bin/; \ rm -rf svgcleaner_linux_x86_64_0.9.5.tar.gz; -RUN set -ex; \ - wget "https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh"; \ - chmod +x "linux-install-$CLOJURE_VERSION.sh"; \ - "./linux-install-$CLOJURE_VERSION.sh"; \ - rm -rf "linux-install-$CLOJURE_VERSION.sh" +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 USER uxbox WORKDIR /home/uxbox diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index 7207a5f29..d93f69e58 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -15,7 +15,8 @@ services: main: privileged: true image: "uxbox-devenv" - hostname: "uxbox-devenv-main" + build: + context: "." container_name: "uxbox-devenv-main" stop_signal: SIGINT @@ -56,7 +57,6 @@ services: postgres: image: postgres:12 command: postgres -c config_file=/etc/postgresql.conf - hostname: "uxbox-devenv-postgres" container_name: "uxbox-devenv-postgres" restart: always stop_signal: SIGINT diff --git a/frontend/deps.edn b/frontend/deps.edn index 9a9b7cd9f..d5cf52729 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -37,7 +37,7 @@ funcool/datoteka {:mvn/version "1.2.0"} binaryage/devtools {:mvn/version "RELEASE"} - thheller/shadow-cljs {:mvn/version "2.11.0"} + thheller/shadow-cljs {:mvn/version "2.11.4"} ;; i18n parsing carocad/parcera {:mvn/version "0.11.0"} diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4b55106fc..72e12d615 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -193,14 +193,15 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -asn1.js@^4.0.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" - integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== dependencies: bn.js "^4.0.0" inherits "^2.0.1" minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" asn1@~0.2.3: version "0.2.4" @@ -372,9 +373,9 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== bn.js@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0" - integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== + version "5.1.3" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" + integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" @@ -462,15 +463,15 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11" - integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA== + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== dependencies: bn.js "^5.1.1" browserify-rsa "^4.0.1" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.2" + elliptic "^6.5.3" inherits "^2.0.4" parse-asn1 "^5.1.5" readable-stream "^3.6.0" @@ -582,9 +583,9 @@ chalk@^2.4.1, chalk@^2.4.2: supports-color "^5.3.0" "chokidar@>=2.0.0 <4.0.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8" - integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ== + version "3.4.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" + integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -847,12 +848,12 @@ core-util-is@1.0.2, core-util-is@~1.0.0: integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= create-ecdh@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" - integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== dependencies: bn.js "^4.1.0" - elliptic "^6.0.0" + elliptic "^6.5.3" create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: version "1.2.0" @@ -979,9 +980,9 @@ dashdash@^1.12.0: assert-plus "^1.0.0" date-fns@^2.15.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f" - integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ== + version "2.16.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b" + integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ== dateformat@^3.0.3: version "3.0.3" @@ -1162,7 +1163,7 @@ electron-to-chromium@^1.3.483: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.487.tgz#8075e6ea33ee2e79a2dfb2a2467033f014017258" integrity sha512-m4QS3IDShxauFfYFpnEzRCcUI55oKB9acEnHCuY/hSCZMz9Pz2KJj+UBnGHxRxS/mS1aphqOQ5wI6gc3yDZ7ew== -elliptic@^6.0.0, elliptic@^6.5.2: +elliptic@^6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== @@ -1292,9 +1293,9 @@ esrever@^0.2.0: integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g= events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -2809,7 +2810,7 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-libs-browser@^2.0.0: +node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== @@ -3080,13 +3081,12 @@ pako@~1.0.5: integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== parse-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" - integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== dependencies: - asn1.js "^4.0.0" + asn1.js "^5.2.0" browserify-aes "^1.0.0" - create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" safe-buffer "^5.1.1" @@ -3259,9 +3259,9 @@ postcss-value-parser@^4.1.0: integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== postcss@^7.0.32: - version "7.0.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" - integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== + version "7.0.34" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20" + integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -3639,9 +3639,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: inherits "^2.0.1" rxjs@^7.0.0-beta.4: - version "7.0.0-beta.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.0.0-beta.4.tgz#bca2bea86cf2074b56f37db202f978ae296c7517" - integrity sha512-VpZJjT9GLSTmQIYC9s1nsAYjJONg7UeSpLFd88uQJpw0VPyobs/2EwK2iTAMGeiLxJWj7BW66BcjeNA1hWbygQ== + version "7.0.0-beta.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.0.0-beta.5.tgz#e2494c8d8393874e83357bb31706f6e3e5c2a2aa" + integrity sha512-cat2RoyKZ4w3W9Hl9E0YJKBL64sj0GG3Dc5CXzseCnKcz6vgYCplBxlCyt8fhlDIYchCzrmP5imrPNhImCYcCA== dependencies: tslib "^1.9.0" @@ -3668,9 +3668,9 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sass@^1.26.10: - version "1.26.10" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.10.tgz#851d126021cdc93decbf201d1eca2a20ee434760" - integrity sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw== + version "1.26.11" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.11.tgz#0f22cc4ab2ba27dad1d4ca30837beb350b709847" + integrity sha512-W1l/+vjGjIamsJ6OnTe0K37U2DBO/dgsv2Z4c89XQ8ZOO6l/VwkqwLSqoYzJeJs6CLuGSTRWc91GbQFL3lvrvw== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -3740,11 +3740,11 @@ shadow-cljs-jar@1.3.2: integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg== shadow-cljs@^2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.0.tgz#6ffdfaad420b4444ba4bf8f6f21a88efe709d75f" - integrity sha512-Cu05hL632tQ6UrpTwglIOHm3E/X5Fu8UXnTDUX9nEadcAc608Ojwk1YoVFM4f0Slt8oFZPUNjKQBgy2Sr/r6qw== + version "2.11.4" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.4.tgz#11778b0cccd67be472f57278a0b870ed17ca878c" + integrity sha512-sIc1MfN/JsGenbFkDXs0+iVrKTSzAE5DzBFuUGxHc4LbcAJ9GWRQlAeE0WRT3fOCQQOlxeBLrxlZ6WiUjKlQgg== dependencies: - node-libs-browser "^2.0.0" + node-libs-browser "^2.2.1" readline-sync "^1.4.7" shadow-cljs-jar "1.3.2" source-map-support "^0.4.15" diff --git a/manage.sh b/manage.sh index 366ee97b8..93e331852 100755 --- a/manage.sh +++ b/manage.sh @@ -6,13 +6,9 @@ DEVENV_IMGNAME="uxbox-devenv" function build-devenv { echo "Building development image $DEVENV_IMGNAME:latest with UID $EXTERNAL_UID..." - local EXTERNAL_UID=${1:-$(id -u)} - - docker build --rm=true --force-rm \ - -t $DEVENV_IMGNAME:latest \ - --build-arg EXTERNAL_UID=$EXTERNAL_UID \ - docker/devenv/; + docker-compose -p uxboxdev -f docker/devenv/docker-compose.yaml build \ + --force-rm --build-arg EXTERNAL_UID=$EXTERNAL_UID } function build-devenv-if-not-exists {