Skip to content

Commit

Permalink
v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Carsten Behring committed Mar 19, 2022
1 parent f9ed48b commit 7f07b07
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 40 deletions.
43 changes: 27 additions & 16 deletions deps.edn
View file
Original file line number Diff line number Diff line change
@@ -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]"]}}}
12 changes: 6 additions & 6 deletions docker-base/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -17,18 +17,18 @@ 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
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'
20 changes: 12 additions & 8 deletions docker-base/deps.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}



Expand Down
3 changes: 2 additions & 1 deletion src/clj/new/clj_py_r_template/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM behrica/clj-py-r:1.5.1
FROM behrica/clj-py-r:1.7.0


ARG USER_ID
Expand All @@ -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

Expand Down
20 changes: 12 additions & 8 deletions src/clj/new/clj_py_r_template/deps.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}



Expand Down
2 changes: 1 addition & 1 deletion src/clj/new/clj_py_r_template/docker_repl.sh
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 7f07b07

Please sign in to comment.