diff --git a/CHANGELOG.md b/CHANGELOG.md index 0da079d7..fde3ef19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ For a list of breaking changes, check [here](#breaking-changes). +## Unreleased + +- Add metabom jar to docker images [#1133](https://github.com/babashka/babashka/issues/1133) ## 0.7.3 (2021-12-30) - Do not require java for bb tasks without deps [#1123](https://github.com/babashka/babashka/issues/1123), [#1124](https://github.com/babashka/babashka/issues/1124) diff --git a/Dockerfile b/Dockerfile index 23dfad9d..53f7f97e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,5 +73,6 @@ RUN ./script/compile FROM ubuntu:latest RUN apt-get update && apt-get install -y curl \ && mkdir -p /usr/local/bin +COPY --from=BASE /opt/target/metabom.jar /opt/babashka-metabom.jar COPY --from=BASE /opt/bb /usr/local/bin/bb CMD ["bb"] diff --git a/project.clj b/project.clj index fcc877b2..725d5dd5 100644 --- a/project.clj +++ b/project.clj @@ -28,6 +28,8 @@ [org.clojure/test.check "1.1.0"] [com.github.clj-easy/graal-build-time "0.1.0"] [rewrite-clj/rewrite-clj "1.0.699-alpha"]] + :plugins [[org.kipz/lein-meta-bom "0.1.1"]] + :metabom {:jar-name "metabom.jar"} :profiles {:feature/xml {:source-paths ["feature-xml"] :dependencies [[org.clojure/data.xml "0.2.0-alpha6"]]} :feature/yaml {:source-paths ["feature-yaml"] diff --git a/script/compile b/script/compile index 3a586daf..6180bb06 100755 --- a/script/compile +++ b/script/compile @@ -33,7 +33,7 @@ rm -rf resources/*.class # "$GRAALVM_HOME/bin/javac" -cp "$SVM_JAR" resources/CutOffMisc.java if [ -z "$BABASHKA_JAR" ]; then lein with-profiles +reflection,+native-image "do" run - lein "do" clean, uberjar + lein "do" clean, uberjar, metabom BABASHKA_JAR=${BABASHKA_JAR:-"target/babashka-$BABASHKA_VERSION-standalone.jar"} fi diff --git a/script/uberjar b/script/uberjar index f595aef8..126e659b 100755 --- a/script/uberjar +++ b/script/uberjar @@ -165,5 +165,5 @@ cp deps.edn resources/META-INF/babashka/deps.edn if [ -z "$BABASHKA_JAR" ]; then lein with-profiles "$BABASHKA_LEIN_PROFILES,+reflection,-uberjar" do run - lein with-profiles "$BABASHKA_LEIN_PROFILES" do clean, uberjar + lein with-profiles "$BABASHKA_LEIN_PROFILES" do clean, uberjar, metabom fi