Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions 29/dind/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Dockerfile-dind.template
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ RUN set -eux; \
ctr --version; \
runc --version

# https://github.com/docker/docker/tree/master/hack/dind
# https://github.com/moby/moby/tree/master/hack/dind
ENV DIND_COMMIT {{ .dindCommit }}

RUN set -eux; \
wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \
wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \
chmod +x /usr/local/bin/dind

COPY dockerd-entrypoint.sh /usr/local/bin/
Expand Down
4 changes: 2 additions & 2 deletions versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ _curl() {
}

dindLatest="$(
_curl -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \
_curl -H 'Accept: application/json' 'https://github.com/moby/moby/commits/master/hack/dind.atom' \
| jq -r '.payload | first(.. | .commits?[]?.oid)'
)"

dockerVersions="$(
git ls-remote --tags https://github.com/docker/docker.git \
git ls-remote --tags https://github.com/moby/moby.git \
| jq --raw-input --null-input --raw-output '
[ inputs | capture("refs/tags/(docker-)?v(?<version>[0-9.a-z-]+)($|\\^)") | .version ]
| unique_by( split(".") | map(tonumber? // .) )
Expand Down
Loading