From 57483bdb7037a3302526c264668dfec9d9cd6e20 Mon Sep 17 00:00:00 2001 From: Daniel Carrion Date: Fri, 7 Oct 2022 13:36:37 +1100 Subject: [PATCH 1/5] chore: change image name and update readme --- Makefile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 61848fc..d4a808e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .DEFAULT_GOAL := help -IMAGE_NAME := cobalt-rootless-nvidia-dind +IMAGE_NAME := harrisonai/rootless-nvidia-dind ## build: build the docker image build: diff --git a/README.md b/README.md index b8e9b54..4bb3a70 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The image is based on the `debian:bullseye-slim` and incorperates these major co Launching from the CLI: ```bash -docker run --rm -it --cap-add "SYS_ADMIN" cobalt-rootless-nvidia-dind:latest +docker run --rm -it --cap-add "SYS_ADMIN" harrisonai/rootless-nvidia-dind ``` As a Kubernetes deployment: @@ -51,7 +51,7 @@ spec: app: dind spec: containers: - - name: docker + - name: dind image: cobalt-rootless-nvidia-dind:latest imagePullPolicy: Always resources: From c67f16fe69affa1d5c7b6b025b365bcebce9945a Mon Sep 17 00:00:00 2001 From: Daniel Carrion Date: Fri, 7 Oct 2022 13:38:29 +1100 Subject: [PATCH 2/5] chore: add pull request template --- .github/workflows/pull_request_template.md | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/pull_request_template.md diff --git a/.github/workflows/pull_request_template.md b/.github/workflows/pull_request_template.md new file mode 100644 index 0000000..2dd75fc --- /dev/null +++ b/.github/workflows/pull_request_template.md @@ -0,0 +1,23 @@ +## Related Tasks + +Does this PR relate to other tasks? + +## Depends on + +Are there any other PRs that need to be merged first? + +## What + +What changes have been made within this PR? + +## Why + +Why are we submitting this PR? What is the context, engineering and business goals being satisfied by this PR? + +## Concerns + +This section is optional, however if you have any concerns or questions regarding aspects of the PR, they can be included here. Including the concerns in this section ensures that they can be discussed as a part of the PR review. + +## Notes + +This section is also optional and should include anything else that you would like to discuss in the PR review that is not captured elsewhere. From 8bc5482c91f545f90af01fbbb3be67a15c4b95bd Mon Sep 17 00:00:00 2001 From: Daniel Carrion Date: Fri, 7 Oct 2022 13:40:04 +1100 Subject: [PATCH 3/5] chore: update image name (again) --- Makefile | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d4a808e..18912ee 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .DEFAULT_GOAL := help -IMAGE_NAME := harrisonai/rootless-nvidia-dind +IMAGE_NAME := harrisonai/cobalt-rootless-nvidia-dind ## build: build the docker image build: diff --git a/README.md b/README.md index 4bb3a70..df0ba42 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The image is based on the `debian:bullseye-slim` and incorperates these major co Launching from the CLI: ```bash -docker run --rm -it --cap-add "SYS_ADMIN" harrisonai/rootless-nvidia-dind +docker run --rm -it --cap-add "SYS_ADMIN" harrisonai/cobalt-rootless-nvidia-dind ``` As a Kubernetes deployment: @@ -52,7 +52,7 @@ spec: spec: containers: - name: dind - image: cobalt-rootless-nvidia-dind:latest + image: harrisonai/cobalt-rootless-nvidia-dind:latest imagePullPolicy: Always resources: requests: From 4694fb51c3341341f561d52c64e548e267c84275 Mon Sep 17 00:00:00 2001 From: Daniel Carrion Date: Fri, 7 Oct 2022 13:46:05 +1100 Subject: [PATCH 4/5] chore: simplify entrypoint naming --- Dockerfile | 2 +- dockerd-entrypoint.sh => entrypoint.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dockerd-entrypoint.sh => entrypoint.sh (100%) diff --git a/Dockerfile b/Dockerfile index faa95d3..114c07c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,5 +47,5 @@ RUN set -ex \ VOLUME /home/rootless/.local/share/docker EXPOSE 2375 -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"] +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] CMD [] diff --git a/dockerd-entrypoint.sh b/entrypoint.sh similarity index 100% rename from dockerd-entrypoint.sh rename to entrypoint.sh From 893faaea2ee5380ba9b99466a3baa0d8d289a9a2 Mon Sep 17 00:00:00 2001 From: Daniel Carrion Date: Fri, 7 Oct 2022 13:53:13 +1100 Subject: [PATCH 5/5] fix entrypoint --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 114c07c..ee43198 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get clean \ && rm -rf /var/lib/apt/lists/* # Docker daemon entrypoint -ADD ./dockerd-entrypoint.sh /usr/local/bin +ADD ./entrypoint.sh /usr/local/bin # Prepare rootless user RUN set -ex \