diff --git a/.gitignore b/.gitignore index 78a3c26..03834f3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ acha-sqlite.db .acha .DS_Store design +./clj-kondo/.cache diff --git a/Dockerfile b/Dockerfile index 39db49a..697c80f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,17 @@ -FROM clojure AS builder +FROM clojure:openjdk-17-lein-slim-buster AS builder +# Build the project COPY . /build WORKDIR /build RUN lein do clean, cljsbuild once prod, uberjar -FROM openjdk:8-jre-alpine -COPY .ssh/insecure_key /root/.ssh/id_rsa -RUN chmod 600 /root/.ssh/id_rsa -RUN printf "Host *\n\tStrictHostKeyChecking no" > /root/.ssh/config +FROM clojure:openjdk-17-lein-slim-buster + +#COPY .ssh/insecure_key /root/.ssh/id_rsa +#RUN chmod 600 /root/.ssh/id_rsa +#RUN printf "Host *\n\tStrictHostKeyChecking no" > /root/.ssh/config COPY --from=builder /build/target/acha-uber.jar /app/acha-uber.jar diff --git a/project.clj b/project.clj index 0603045..9b5c01b 100644 --- a/project.clj +++ b/project.clj @@ -13,7 +13,7 @@ #"public/react-.*"] :dependencies [ - [org.clojure/clojure "1.7.0-RC1"] + [org.clojure/clojure "1.8.0"] [org.clojure/tools.logging "0.3.1"] [org.clojure/tools.cli "0.3.1"] [ch.qos.logback/logback-classic "1.1.3"] @@ -27,10 +27,11 @@ [clj-jgit "0.8.10" :exclusions [org.clojure/core.memoize]] [org.clojure/java.jdbc "0.3.7"] - [org.xerial/sqlite-jdbc "3.8.10.1"] + [org.xerial/sqlite-jdbc "3.42.0.0"] [com.mchange/c3p0 "0.9.5"] - [org.clojure/clojurescript "0.0-3308"] + [org.clojure/clojurescript "1.11.60"] + [javax.xml.bind/jaxb-api "2.3.0"] [rum "0.2.6" :exclusions [cljsjs/react]] [cljsjs/react-with-addons "0.12.2-7"] @@ -43,7 +44,7 @@ :plugins [ [lein-ring "0.9.4"] - [lein-cljsbuild "1.0.6"] + [lein-cljsbuild "1.1.8"] ] :clean-targets ^{:protect false} [ "target"