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 .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
variables:
DOCKER_CERT_DIR: ""
services:
- name: docker:29.4.0-dind@sha256:a6dd5322747a95cd8e3207bd8d415a8fd20ec34e9c00f06dc019cbd912013489
image: docker:29.4.0@sha256:a6dd5322747a95cd8e3207bd8d415a8fd20ec34e9c00f06dc019cbd912013489
- name: docker:29.4.1-dind@sha256:c77e5d7912f9b137cc67051fdc2991d8f5ae22c55ddf532bb836dcb693a04940
image: docker:29.4.1@sha256:c77e5d7912f9b137cc67051fdc2991d8f5ae22c55ddf532bb836dcb693a04940
before_script: |
echo "${CI_REGISTRY_PASSWORD}" \
| docker login "${CI_REGISTRY}" \
Expand Down
16 changes: 8 additions & 8 deletions tools/docker/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@ RUN <<EOF
mkdir -p "${prefix}/libexec/${name}/bin"
EOF

RUN --mount=type=cache,target=/var/cache/uniget/download <<EOF
RUN <<EOF
url="https://download.docker.com/linux/static/stable/${arch}/docker-${version}.tgz"
filename="$( basename "${url}" )"

check-download "${url}"
curl --silent --show-error --location --fail --output "${uniget_cache_download}/${filename}" \
curl --silent --show-error --location --fail --output "/tmp/${filename}" \
"${url}"

tar --file="${uniget_cache_download}/${filename}" --list
tar --file="${uniget_cache_download}/${filename}" --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
tar --file="/tmp/${filename}" --list
tar --file="/tmp/${filename}" --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
mv "${prefix}/libexec/${name}/bin/dockerd" "${prefix}/bin/"
mv "${prefix}/libexec/${name}/bin/docker" "${prefix}/bin/"
mv "${prefix}/libexec/${name}/bin/docker-proxy" "${prefix}/bin/"
EOF

RUN --mount=type=cache,target=/var/cache/uniget/download <<EOF
RUN <<EOF
url="https://download.docker.com/linux/static/stable/${arch}/docker-rootless-extras-${version}.tgz"
filename="$( basename "${url}" )"

check-download "${url}"
curl --silent --show-error --location --fail --output "${uniget_cache_download}/${filename}" \
curl --silent --show-error --location --fail --output "/tmp/${filename}" \
"${url}"

tar --file="${uniget_cache_download}/${filename}" --list
tar --file="${uniget_cache_download}/${filename}" --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
tar --file="/tmp/${filename}" --list
tar --file="/tmp/${filename}" --extract --gzip --directory="${prefix}/libexec/${name}/bin" --no-same-owner --strip-components=1
mv "${prefix}/libexec/${name}/bin/dockerd-rootless.sh" "${prefix}/bin/"
mv "${prefix}/libexec/${name}/bin/dockerd-rootless-setuptool.sh" "${prefix}/bin/"
EOF
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml
$schema: https://tools.uniget.dev/schema.yaml
name: docker
version: "29.4.0"
version: "29.4.1"
binary: dockerd
check: ${binary} --version | cut -d, -f1 | cut -d' ' -f3
runtime_dependencies:
Expand Down
Loading