From 7f07b072ee92a00c9a3daa75f9fd2162d0c0a551 Mon Sep 17 00:00:00 2001 From: Carsten Behring Date: Sat, 19 Mar 2022 01:19:00 +0100 Subject: [PATCH] v1.7.0 --- deps.edn | 43 ++++++++++++-------- docker-base/Dockerfile | 12 +++--- docker-base/deps.edn | 20 +++++---- src/clj/new/clj_py_r_template/Dockerfile | 3 +- src/clj/new/clj_py_r_template/deps.edn | 20 +++++---- src/clj/new/clj_py_r_template/docker_repl.sh | 2 +- 6 files changed, 60 insertions(+), 40 deletions(-) diff --git a/deps.edn b/deps.edn index 8ed1cca..a036677 100644 --- a/deps.edn +++ b/deps.edn @@ -1,20 +1,31 @@ { - :paths ["src"] + :mvn/repos {"clojars" {:url "https://repo.clojars.org/"} + "central" {:url "https://repo1.maven.org/maven2/"} + "bedatadriven" {:url "https://nexus.bedatadriven.com/content/groups/public/"}} + + :paths ["src" "resources"] :deps { - org.clojure/clojure {:mvn/version "1.10.2"} - seancorfield/clj-new {:mvn/version "1.1.264"} - } + org.clojure/clojure {:mvn/version "1.10.3"} + clj-python/libpython-clj {:mvn/version "2.018"} + scicloj/clojisr {:mvn/version "1.0.0-BETA19"} + scicloj/tablecloth {:mvn/version "6.076"} + scicloj/notespace {:mvn/version "3-beta9"} + scicloj/scicloj.ml {:mvn/version "0.2.0"} + com.cnuernber/libjulia-clj {:mvn/version "1.000-beta-8"} + behrica/libapl-clj {:git/url "https://github.com/behrica/libapl-clj" + :git/sha "f40e17a95eaab6f81417d315f8499be7141b813c"} + ;; {:mvn/version "0.1.2-ALPHA-SNAPSHOT"} + + io.github.nextjournal/clerk {:mvn/version "0.6.387"}} + + + + + + :aliases { - :deploy {:extra-deps {deps-deploy {:mvn/version "RELEASE"}} - :main-opts ["-m" "deps-deploy.deps-deploy" "deploy" - "deps-deploy.jar"]} - - :jar {:extra-deps {pack/pack.alpha - {:git/url "https://github.com/juxt/pack.alpha.git" - :sha "e518d9b2b70f4292c9988d2792b8667d88a6f4df"} -org.clojure/tools.deps.alpha {:mvn/version "0.7.541"}} - :main-opts ["-m" "mach.pack.alpha.skinny" "--no-libs" - "--project-path" "deps-deploy.jar"]} - } -} + :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.27.2"} + refactor-nrepl {:mvn/version "3.0.0-alpha13"}} + :main-opts ["-m" "nrepl.cmdline" "-b" "0.0.0.0" "-p" "12345" + "--middleware" "[cider.nrepl/cider-middleware,refactor-nrepl.middleware/wrap-refactor]"]}}} diff --git a/docker-base/Dockerfile b/docker-base/Dockerfile index d2d3da6..fe84fa5 100644 --- a/docker-base/Dockerfile +++ b/docker-base/Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/r-ver:4.1.1 +FROM rocker/r-ver:4.1.2 RUN apt-get update && apt-get -y install --reinstall ca-certificates && update-ca-certificates RUN apt-get update && apt-get -y install openjdk-11-jdk curl rlwrap libssl-dev build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libreadline-dev libffi-dev libbz2-dev \ automake-1.15 git liblzma-dev @@ -17,10 +17,10 @@ RUN pip3 install -U numpy wheel scikit-learn cython RUN git clone https://git.savannah.gnu.org/git/apl.git RUN cd apl/trunk && ./configure && make develop_lib && make install -RUN curl -O https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.3-linux-x86_64.tar.gz \ - && tar -xvzf julia-1.5.3-linux-x86_64.tar.gz -RUN mv julia-1.5.3/ /opt/ -RUN ln -s /opt/julia-1.5.3/bin/julia /usr/local/bin/julia +RUN curl -O https://julialang-s3.julialang.org/bin/linux/x64/1.7/julia-1.7.2-linux-x86_64.tar.gz \ + && tar -xvzf julia-1.7.2-linux-x86_64.tar.gz +RUN mv julia-1.7.2/ /opt/ +RUN ln -s /opt/julia-1.7.2/bin/julia /usr/local/bin/julia RUN export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 && pip3 install cljbridge==0.0.7 @@ -28,7 +28,7 @@ COPY deps.edn . RUN clj -P -Srepro -Sdeps '{:mvn/local-repo "/tmp/.m2/repository"}' EXPOSE 12345 -ENV JULIA_HOME=/opt/julia-1.5.3 +ENV JULIA_HOME=/opt/julia-1.7.2 CMD ["python3", "-c", "from clojurebridge import cljbridge;cljbridge.init_jvm(start_repl=True,port=12345,bind='0.0.0.0',mvn_local_repo='/tmp/.m2/repository')"] #clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version "0.8.3"} cider/cider-nrepl {:mvn/version "0.25.5"}}}' -Sdeps '{:mvn/local-repo "/tmp/.m2/repository"}' '-Spath' diff --git a/docker-base/deps.edn b/docker-base/deps.edn index 26710f0..a036677 100644 --- a/docker-base/deps.edn +++ b/docker-base/deps.edn @@ -6,14 +6,18 @@ :paths ["src" "resources"] :deps { - org.clojure/clojure {:mvn/version "1.10.3"} - clj-python/libpython-clj {:mvn/version "2.000"} - scicloj/clojisr {:mvn/version "1.0.0-BETA19"} - scicloj/tablecloth {:mvn/version "6.023"} - scicloj/notespace {:mvn/version "3-beta9"} - scicloj/scicloj.ml {:mvn/version "0.1.0"} - cnuernber/libjulia-clj {:mvn/version "0.07"} - jjtolton/libapl-clj {:mvn/version "0.1.2-ALPHA-SNAPSHOT"}} + org.clojure/clojure {:mvn/version "1.10.3"} + clj-python/libpython-clj {:mvn/version "2.018"} + scicloj/clojisr {:mvn/version "1.0.0-BETA19"} + scicloj/tablecloth {:mvn/version "6.076"} + scicloj/notespace {:mvn/version "3-beta9"} + scicloj/scicloj.ml {:mvn/version "0.2.0"} + com.cnuernber/libjulia-clj {:mvn/version "1.000-beta-8"} + behrica/libapl-clj {:git/url "https://github.com/behrica/libapl-clj" + :git/sha "f40e17a95eaab6f81417d315f8499be7141b813c"} + ;; {:mvn/version "0.1.2-ALPHA-SNAPSHOT"} + + io.github.nextjournal/clerk {:mvn/version "0.6.387"}} diff --git a/src/clj/new/clj_py_r_template/Dockerfile b/src/clj/new/clj_py_r_template/Dockerfile index c7aac57..9f48a20 100644 --- a/src/clj/new/clj_py_r_template/Dockerfile +++ b/src/clj/new/clj_py_r_template/Dockerfile @@ -1,4 +1,4 @@ -FROM behrica/clj-py-r:1.5.1 +FROM behrica/clj-py-r:1.7.0 ARG USER_ID @@ -7,6 +7,7 @@ ARG GROUP_ID RUN addgroup --gid $GROUP_ID user RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user +RUn chown -R user:user /tmp/.m2/repository USER user WORKDIR /home/user diff --git a/src/clj/new/clj_py_r_template/deps.edn b/src/clj/new/clj_py_r_template/deps.edn index bc1fb8f..a036677 100644 --- a/src/clj/new/clj_py_r_template/deps.edn +++ b/src/clj/new/clj_py_r_template/deps.edn @@ -6,14 +6,18 @@ :paths ["src" "resources"] :deps { - org.clojure/clojure {:mvn/version "1.10.3"} - clj-python/libpython-clj {:mvn/version "2.003"} - scicloj/clojisr {:mvn/version "1.0.0-BETA19"} - scicloj/tablecloth {:mvn/version "6.025"} - scicloj/notespace {:mvn/version "3-beta9"} - scicloj/scicloj.ml {:mvn/version "0.1.1"} - cnuernber/libjulia-clj {:mvn/version "0.07"} - jjtolton/libapl-clj {:mvn/version "0.1.2-ALPHA-SNAPSHOT"}} + org.clojure/clojure {:mvn/version "1.10.3"} + clj-python/libpython-clj {:mvn/version "2.018"} + scicloj/clojisr {:mvn/version "1.0.0-BETA19"} + scicloj/tablecloth {:mvn/version "6.076"} + scicloj/notespace {:mvn/version "3-beta9"} + scicloj/scicloj.ml {:mvn/version "0.2.0"} + com.cnuernber/libjulia-clj {:mvn/version "1.000-beta-8"} + behrica/libapl-clj {:git/url "https://github.com/behrica/libapl-clj" + :git/sha "f40e17a95eaab6f81417d315f8499be7141b813c"} + ;; {:mvn/version "0.1.2-ALPHA-SNAPSHOT"} + + io.github.nextjournal/clerk {:mvn/version "0.6.387"}} diff --git a/src/clj/new/clj_py_r_template/docker_repl.sh b/src/clj/new/clj_py_r_template/docker_repl.sh index 07b18d1..84b06ed 100755 --- a/src/clj/new/clj_py_r_template/docker_repl.sh +++ b/src/clj/new/clj_py_r_template/docker_repl.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -euo pipefail -docker run -it --rm -v $HOME/.m2:/home/user/.m2 -v "$(pwd):/workdir" -p 12345:12345 -w /workdir {{name}} +docker run -it --rm -v -v "$(pwd):/workdir" -p 12345:12345 -p 7777:7777 -w /workdir appcompany.funapp