Skip to content

Commit 65ac726

Browse files
cap10morgancap10morgan
authored
Merge pull request #260 from Quantisan/feature/remove-git-from-lein-variants
Remove git from lein variants
2 parents 31ec9d8 + 9712933 commit 65ac726

File tree

46 files changed

+167
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+167
-167
lines changed

‎src/docker_clojure/dockerfile/lein.clj‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
(def distro-deps
1010
{:debian-slim {:build #{"wget" "gnupg"}
11-
:runtime #{"git"}}
11+
:runtime #{}}
1212
:debian {:build #{"wget" "gnupg"}
13-
:runtime #{"make" "git"}}
13+
:runtime #{"make"}}
1414
:ubuntu {:build #{"wget" "gnupg"}
15-
:runtime #{"make" "git"}}
15+
:runtime #{"make"}}
1616
:alpine {:build #{"tar" "gnupg" "openssl" "ca-certificates"}
17-
:runtime #{"bash" "git"}}})
17+
:runtime #{"bash"}}})
1818

1919
(def install-deps (partial install-distro-deps distro-deps))
2020

@@ -43,36 +43,36 @@
4343
"RUN set -eux; \\"]
4444
(concat-commands install-dep-cmds)
4545
(concat-commands
46-
["mkdir -p $LEIN_INSTALL"
47-
"wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg"
48-
"echo \"Comparing lein-pkg checksum ...\""
49-
"sha256sum lein-pkg"
50-
(str "echo \"" (get-in installer-hashes ["lein" build-tool-version]) " *lein-pkg\" | sha256sum -c -")
51-
"mv lein-pkg $LEIN_INSTALL/lein"
52-
"chmod 0755 $LEIN_INSTALL/lein"
53-
"export GNUPGHOME=\"$(mktemp -d)\""
54-
"export FILENAME_EXT=jar" ; used to be zip but hopefully it's always jar now?
55-
(str "gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "
56-
(gpg-key build-tool-version))
57-
"wget -q https://codeberg.org/leiningen/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT"
58-
"wget -q https://codeberg.org/leiningen/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc"
59-
"echo \"Verifying file PGP signature...\""
60-
"gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT"
61-
"gpgconf --kill all"
62-
"rm -rf \"$GNUPGHOME\" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc"
63-
"mkdir -p /usr/share/java"
64-
"mkdir -p /root/.lein"
65-
"mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar"]
66-
(empty? uninstall-dep-cmds))
46+
["mkdir -p $LEIN_INSTALL"
47+
"wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg"
48+
"echo \"Comparing lein-pkg checksum ...\""
49+
"sha256sum lein-pkg"
50+
(str "echo \"" (get-in installer-hashes ["lein" build-tool-version]) " *lein-pkg\" | sha256sum -c -")
51+
"mv lein-pkg $LEIN_INSTALL/lein"
52+
"chmod 0755 $LEIN_INSTALL/lein"
53+
"export GNUPGHOME=\"$(mktemp -d)\""
54+
"export FILENAME_EXT=jar" ; used to be zip but hopefully it's always jar now?
55+
(str "gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "
56+
(gpg-key build-tool-version))
57+
"wget -q https://codeberg.org/leiningen/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT"
58+
"wget -q https://codeberg.org/leiningen/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc"
59+
"echo \"Verifying file PGP signature...\""
60+
"gpg --batch --verify leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT"
61+
"gpgconf --kill all"
62+
"rm -rf \"$GNUPGHOME\" leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT.asc"
63+
"mkdir -p /usr/share/java"
64+
"mkdir -p /root/.lein"
65+
"mv leiningen-$LEIN_VERSION-standalone.$FILENAME_EXT /usr/share/java/leiningen-$LEIN_VERSION-standalone.jar"]
66+
(empty? uninstall-dep-cmds))
6767
(concat-commands uninstall-dep-cmds :end)
6868
(concat
69-
[""
70-
"ENV PATH=$PATH:$LEIN_INSTALL"
71-
"ENV LEIN_ROOT 1"
72-
""
73-
"# Install clojure 1.12.0 so users don't have to download it every time"
74-
"RUN echo '(defproject dummy \"\" :dependencies [[org.clojure/clojure \"1.12.0\"]])' > project.clj \\"
75-
" && lein deps && rm project.clj"])
69+
[""
70+
"ENV PATH=$PATH:$LEIN_INSTALL"
71+
"ENV LEIN_ROOT 1"
72+
""
73+
"# Install clojure 1.12.1 so users don't have to download it every time"
74+
"RUN echo '(defproject dummy \"\" :dependencies [[org.clojure/clojure \"1.12.1\"]])' > project.clj \\"
75+
" && lein deps && rm project.clj"])
7676

7777
(->> (remove nil?)))))
7878

‎target/debian-bookworm-11/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y make git gnupg wget && \
15+
apt-get install -y make gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
CMD ["lein", "repl"]

‎target/debian-bookworm-17/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y make git gnupg wget && \
15+
apt-get install -y make gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
COPY entrypoint /usr/local/bin/entrypoint

‎target/debian-bookworm-21/latest/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ WORKDIR /tmp
1414
# Download the whole repo as an archive
1515
RUN set -eux; \
1616
apt-get update && \
17-
apt-get install -y make git gnupg wget && \
17+
apt-get install -y make gnupg wget && \
1818
rm -rf /var/lib/apt/lists/* && \
1919
mkdir -p $LEIN_INSTALL && \
2020
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -40,8 +40,8 @@ apt-get purge -y --auto-remove gnupg wget
4040
ENV PATH=$PATH:$LEIN_INSTALL
4141
ENV LEIN_ROOT 1
4242

43-
# Install clojure 1.12.0 so users don't have to download it every time
44-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
43+
# Install clojure 1.12.1 so users don't have to download it every time
44+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4545
&& lein deps && rm project.clj
4646

4747
### INSTALL TOOLS-DEPS ###

‎target/debian-bookworm-21/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y make git gnupg wget && \
15+
apt-get install -y make gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
COPY entrypoint /usr/local/bin/entrypoint

‎target/debian-bookworm-24/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y make git gnupg wget && \
15+
apt-get install -y make gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
COPY entrypoint /usr/local/bin/entrypoint

‎target/debian-bookworm-8/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y make git gnupg wget && \
15+
apt-get install -y make gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
CMD ["lein", "repl"]

‎target/debian-bookworm-slim-11/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y git gnupg wget && \
15+
apt-get install -y gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
CMD ["lein", "repl"]

‎target/debian-bookworm-slim-17/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y git gnupg wget && \
15+
apt-get install -y gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
COPY entrypoint /usr/local/bin/entrypoint

‎target/debian-bookworm-slim-21/lein/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
# Download the whole repo as an archive
1313
RUN set -eux; \
1414
apt-get update && \
15-
apt-get install -y git gnupg wget && \
15+
apt-get install -y gnupg wget && \
1616
rm -rf /var/lib/apt/lists/* && \
1717
mkdir -p $LEIN_INSTALL && \
1818
wget -q https://codeberg.org/leiningen/leiningen/raw/tag/$LEIN_VERSION/bin/lein-pkg && \
@@ -38,8 +38,8 @@ apt-get purge -y --auto-remove gnupg wget
3838
ENV PATH=$PATH:$LEIN_INSTALL
3939
ENV LEIN_ROOT 1
4040

41-
# Install clojure 1.12.0 so users don't have to download it every time
42-
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.0"]])' > project.clj \
41+
# Install clojure 1.12.1 so users don't have to download it every time
42+
RUN echo '(defproject dummy "" :dependencies [[org.clojure/clojure "1.12.1"]])' > project.clj \
4343
&& lein deps && rm project.clj
4444

4545
COPY entrypoint /usr/local/bin/entrypoint

0 commit comments

Comments
 (0)