Update lein to 2.8.0 for clojure image #3615
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index e7b4ecd..cfcd13d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ clojure:boot-2.7.2-alpine
clojure:boot-alpine
clojure:latest
clojure:lein
-clojure:lein-2.7.1
-clojure:lein-2.7.1-alpine
-clojure:lein-2.7.1-alpine-onbuild
-clojure:lein-2.7.1-onbuild
+clojure:lein-2.8.0
+clojure:lein-2.8.0-alpine
+clojure:lein-2.8.0-alpine-onbuild
+clojure:lein-2.8.0-onbuild
clojure:lein-alpine
clojure:lein-alpine-onbuild
clojure:lein-onbuild
diff --git a/clojure_alpine/Dockerfile b/clojure_alpine/Dockerfile
index 9eef36c..9ed50a7 100644
--- a/clojure_alpine/Dockerfile
+++ b/clojure_alpine/Dockerfile
@@ -7,7 +7,7 @@
FROM openjdk:8-alpine
MAINTAINER Wes Morgan <wesmorgan@icloud.com>
-ENV LEIN_VERSION=2.7.1
+ENV LEIN_VERSION=2.8.0
ENV LEIN_INSTALL=/usr/local/bin/
WORKDIR /tmp
@@ -16,26 +16,16 @@ RUN apk add --update tar gnupg bash openssl && rm -rf /var/cache/apk/*
# Download the whole repo as an archive
RUN mkdir -p $LEIN_INSTALL \
- && wget -q https://github.com/technomancy/leiningen/archive/$LEIN_VERSION.tar.gz \
- && echo "Comparing archive checksum ..." \
- && echo "876221e884780c865c2ce5c9aa5675a7cae9f215 *$LEIN_VERSION.tar.gz" | sha1sum -c - \
-
- && mkdir ./leiningen \
- && tar -xzf $LEIN_VERSION.tar.gz -C ./leiningen/ --strip-components=1 \
- && mv leiningen/bin/lein-pkg $LEIN_INSTALL/lein \
- && rm -rf $LEIN_VERSION.tar.gz ./leiningen \
-
+ && wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg \
+ && echo "Comparing lein-pkg checksum ..." \
+ && echo "2efff6ca3a77d66d041d705abf7a92cb7efafabb *lein-pkg" | sha1sum -c - \
+ && mv lein-pkg $LEIN_INSTALL/lein \
&& chmod 0755 $LEIN_INSTALL/lein \
-
-# Download and verify Lein stand-alone jar
&& wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip \
&& wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc \
-
- && gpg --keyserver pool.sks-keyservers.net --recv-key 2E708FB2FCECA07FF8184E275A92E04305696D78 \
+ && gpg --keyserver pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 \
&& echo "Verifying Jar file signature ..." \
&& gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc \
-
-# Put the jar where lein script expects
&& rm leiningen-$LEIN_VERSION-standalone.zip.asc \
&& mkdir -p /usr/share/java \
&& mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
diff --git a/clojure_latest/Dockerfile b/clojure_latest/Dockerfile
index 711084a..0528253 100644
--- a/clojure_latest/Dockerfile
+++ b/clojure_latest/Dockerfile
@@ -7,33 +7,23 @@
FROM openjdk:8
MAINTAINER Paul Lam <paul@quantisan.com>
-ENV LEIN_VERSION=2.7.1
+ENV LEIN_VERSION=2.8.0
ENV LEIN_INSTALL=/usr/local/bin/
WORKDIR /tmp
# Download the whole repo as an archive
RUN mkdir -p $LEIN_INSTALL \
- && wget -q https://github.com/technomancy/leiningen/archive/$LEIN_VERSION.tar.gz \
- && echo "Comparing archive checksum ..." \
- && echo "876221e884780c865c2ce5c9aa5675a7cae9f215 *$LEIN_VERSION.tar.gz" | sha1sum -c - \
-
- && mkdir ./leiningen \
- && tar -xzf $LEIN_VERSION.tar.gz -C ./leiningen/ --strip-components=1 \
- && mv leiningen/bin/lein-pkg $LEIN_INSTALL/lein \
- && rm -rf $LEIN_VERSION.tar.gz ./leiningen \
-
+ && wget -q https://raw.githubusercontent.com/technomancy/leiningen/$LEIN_VERSION/bin/lein-pkg \
+ && echo "Comparing lein-pkg checksum ..." \
+ && echo "2efff6ca3a77d66d041d705abf7a92cb7efafabb *lein-pkg" | sha1sum -c - \
+ && mv lein-pkg $LEIN_INSTALL/lein \
&& chmod 0755 $LEIN_INSTALL/lein \
-
-# Download and verify Lein stand-alone jar
&& wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip \
&& wget -q https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip.asc \
-
- && gpg --keyserver pool.sks-keyservers.net --recv-key 2E708FB2FCECA07FF8184E275A92E04305696D78 \
+ && gpg --keyserver pool.sks-keyservers.net --recv-key 2B72BF956E23DE5E830D50F6002AF007D1A7CC18 \
&& echo "Verifying Jar file signature ..." \
&& gpg --verify leiningen-$LEIN_VERSION-standalone.zip.asc \
-
-# Put the jar where lein script expects
&& rm leiningen-$LEIN_VERSION-standalone.zip.asc \
&& mkdir -p /usr/share/java \
&& mv leiningen-$LEIN_VERSION-standalone.zip /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar |
|
Build test of #3615; b254b08 ( $ bashbrew build clojure:lein-2.8.0
Building bashbrew/cache:9360967a55b579d9a1a20d8efefa73f0c9d7f5a31969180b145d5b3d28ac5f7a (clojure:lein-2.8.0)
Tagging clojure:lein-2.8.0
Tagging clojure:lein
Tagging clojure:latest
$ test/run.sh clojure:lein-2.8.0
testing clojure:lein-2.8.0
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build clojure:lein-2.8.0-onbuild
Building bashbrew/cache:00c62c4fb7d271461e1fc149418e97a4fe8396d1b7a447ff83d9e20d32a3caf4 (clojure:lein-2.8.0-onbuild)
Tagging clojure:lein-2.8.0-onbuild
Tagging clojure:lein-onbuild
Tagging clojure:onbuild
$ test/run.sh clojure:lein-2.8.0-onbuild
testing clojure:lein-2.8.0-onbuild
'override-cmd' [1/1]...passed
$ bashbrew build clojure:lein-2.8.0-alpine
Building bashbrew/cache:d59379b201367295f5a3ae8fbf1b366a18245e99861dd8afe42aa72d872f12a2 (clojure:lein-2.8.0-alpine)
Tagging clojure:lein-2.8.0-alpine
Tagging clojure:lein-alpine
Tagging clojure:alpine
$ test/run.sh clojure:lein-2.8.0-alpine
testing clojure:lein-2.8.0-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build clojure:lein-2.8.0-alpine-onbuild
Building bashbrew/cache:d345cbd13a513695a4344e7c06adff14b6149f59cf1e37f07e64b2ba713625b4 (clojure:lein-2.8.0-alpine-onbuild)
Tagging clojure:lein-2.8.0-alpine-onbuild
Tagging clojure:lein-alpine-onbuild
Tagging clojure:alpine-onbuild
$ test/run.sh clojure:lein-2.8.0-alpine-onbuild
testing clojure:lein-2.8.0-alpine-onbuild
'override-cmd' [1/1]...passed
$ bashbrew build clojure:boot-2.7.2
Using bashbrew/cache:e7e6fbb954447fe92e06ccda14a4e093661feacce4bafc3068aea49751623e8e (clojure:boot-2.7.2)
Tagging clojure:boot-2.7.2
Tagging clojure:boot
$ test/run.sh clojure:boot-2.7.2
testing clojure:boot-2.7.2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build clojure:boot-2.7.2-alpine
Using bashbrew/cache:f68c2d3382dbaeef13cfbd95ec7a355d1835a0a5ded4917ca5e72b60f380d8aa (clojure:boot-2.7.2-alpine)
Tagging clojure:boot-2.7.2-alpine
Tagging clojure:boot-alpine
$ test/run.sh clojure:boot-2.7.2-alpine
testing clojure:boot-2.7.2-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Leiningen 2.8.0 has been released, and this updates the
leinvariants of the clojure image to use it.