Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ acha-sqlite.db
.acha
.DS_Store
design
./clj-kondo/.cache
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
9 changes: 5 additions & 4 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"]
Expand All @@ -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"
Expand Down