Skip to content

Commit

Permalink
Revert: Add metabom jar to docker image(9cf6a1a)
Browse files Browse the repository at this point in the history
  • Loading branch information
lispyclouds committed Jan 11, 2022
1 parent f453928 commit 2f6d363
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ For a list of breaking changes, check [here](#breaking-changes).
## Unreleased

- Add opencontainers annoations to docker image [#1134](https://github.com/babashka/babashka/issues/1134)
- Add metabom jar to docker images [#1133](https://github.com/babashka/babashka/issues/1133)

## 0.7.3 (2021-12-30)

Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,5 @@ 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"]
2 changes: 0 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
[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"]
Expand Down
2 changes: 1 addition & 1 deletion script/compile
Original file line number Diff line number Diff line change
Expand Up @@ -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, metabom
lein "do" clean, uberjar
BABASHKA_JAR=${BABASHKA_JAR:-"target/babashka-$BABASHKA_VERSION-standalone.jar"}
fi

Expand Down
2 changes: 1 addition & 1 deletion script/uberjar
Original file line number Diff line number Diff line change
Expand Up @@ -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, metabom
lein with-profiles "$BABASHKA_LEIN_PROFILES" do clean, uberjar
fi

0 comments on commit 2f6d363

Please sign in to comment.