Skip to content

Update tools-deps to 1.10.1.502 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 22, 2020
Merged

Update tools-deps to 1.10.1.502 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ad2e05
Update tools-deps to 1.10.1.496
cap10morgan Jan 20, 2020
f27e82b
Update tools-deps to 1.10.1.502
cap10morgan Jan 21, 2020
88f087e
Add make to runtime deps for tools-deps images
cap10morgan Jan 21, 2020
814aab3
Merge branch 'master' into update/tools-deps
cap10morgan Jan 21, 2020
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
2 changes: 1 addition & 1 deletion src/docker_clojure/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
(def build-tools
{"lein" "2.9.1"
"boot" "2.8.3"
"tools-deps" "1.10.1.483"})
"tools-deps" "1.10.1.502"})

(def exclusions ; don't build these for whatever reason(s)
#{{:jdk-version 8
Expand Down
4 changes: 2 additions & 2 deletions src/docker_clojure/dockerfile/tools_deps.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

(def distro-deps
{"slim-buster" {:build #{"wget" "curl"}
:runtime #{"rlwrap"}}
:runtime #{"rlwrap" "make"}}
"alpine" {:build #{"curl"}
:runtime #{"bash"}}})
:runtime #{"bash" "make"}}})

(defn install-deps [{:keys [distro]}]
(case distro
Expand Down
4 changes: 2 additions & 2 deletions target/openjdk-11-slim-buster/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM openjdk:11-slim-buster

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl rlwrap wget && \
apt-get install -y curl make rlwrap wget && \
rm -rf /var/lib/apt/lists/* && \
wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
chmod +x linux-install-$CLOJURE_VERSION.sh && \
Expand Down
2 changes: 1 addition & 1 deletion target/openjdk-11-stretch/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:11-stretch

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

Expand Down
2 changes: 1 addition & 1 deletion target/openjdk-13-buster/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:13-buster

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

Expand Down
4 changes: 2 additions & 2 deletions target/openjdk-13-slim-buster/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM openjdk:13-slim-buster

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl rlwrap wget && \
apt-get install -y curl make rlwrap wget && \
rm -rf /var/lib/apt/lists/* && \
wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
chmod +x linux-install-$CLOJURE_VERSION.sh && \
Expand Down
4 changes: 2 additions & 2 deletions target/openjdk-14-alpine/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM openjdk:14-alpine

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

RUN \
apk add --update --no-cache curl bash && \
apk add --update --no-cache curl bash make && \
wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
chmod +x linux-install-$CLOJURE_VERSION.sh && \
./linux-install-$CLOJURE_VERSION.sh && \
Expand Down
2 changes: 1 addition & 1 deletion target/openjdk-14-buster/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:14-buster

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

Expand Down
4 changes: 2 additions & 2 deletions target/openjdk-14-slim-buster/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM openjdk:14-slim-buster

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl rlwrap wget && \
apt-get install -y curl make rlwrap wget && \
rm -rf /var/lib/apt/lists/* && \
wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
chmod +x linux-install-$CLOJURE_VERSION.sh && \
Expand Down
4 changes: 2 additions & 2 deletions target/openjdk-8-slim-buster/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM openjdk:8-slim-buster

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

RUN \
apt-get update && \
apt-get install -y curl rlwrap wget && \
apt-get install -y curl make rlwrap wget && \
rm -rf /var/lib/apt/lists/* && \
wget https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh && \
chmod +x linux-install-$CLOJURE_VERSION.sh && \
Expand Down
2 changes: 1 addition & 1 deletion target/openjdk-8-stretch/tools-deps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:8-stretch

ENV CLOJURE_VERSION=1.10.1.483
ENV CLOJURE_VERSION=1.10.1.502

WORKDIR /tmp

Expand Down