feat(k8s): add ECR credential helper to in-cluster docker builder

garden-io · Mar 10, 2020 · 6c0d3d3 · 6c0d3d3
1 parent 699cbac
commit 6c0d3d3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 2 deletions.
diff --git a/garden-service/static/kubernetes/system/docker-daemon/values.yaml b/garden-service/static/kubernetes/system/docker-daemon/values.yaml
@@ -3,8 +3,8 @@
 # Declare variables to be passed into your templates.
 
 image:
-  repository: docker
-  tag: 19.03.4-dind
+  repository: gardendev/docker-dind
+  tag: "19.03.7"
   pullPolicy: IfNotPresent
 
 nameOverride: "garden-docker-daemon"

diff --git a/images/README.md b/images/README.md
@@ -0,0 +1,3 @@
+# images
+
+Here we place container images that we maintain and reference when using Garden.
diff --git a/images/docker-dind/Dockerfile b/images/docker-dind/Dockerfile
@@ -0,0 +1,6 @@
+FROM docker:19.03.7-dind
+
+RUN apk add --no-cache curl
+RUN cd /usr/local/bin && \
+  curl -O https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.4.0/linux-amd64/docker-credential-ecr-login && \
+  chmod +x docker-credential-ecr-login
diff --git a/images/docker-dind/garden.yml b/images/docker-dind/garden.yml
@@ -0,0 +1,6 @@
+kind: Module
+type: container
+name: docker-dind
+description: The image used for the in-cluster docker daemon. Extending the base image to add credential helpers.
+image: gardendev/docker-dind:19.03.7
+dockerfile: Dockerfile
diff --git a/rsync-server/Dockerfile → images/rsync-server/Dockerfile b/rsync-server/Dockerfile → images/rsync-server/Dockerfile
diff --git a/rsync-server/entrypoint.sh → images/rsync-server/entrypoint.sh b/rsync-server/entrypoint.sh → images/rsync-server/entrypoint.sh
diff --git a/rsync-server/garden.yml → images/rsync-server/garden.yml b/rsync-server/garden.yml → images/rsync-server/garden.yml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# images

		Here we place container images that we maintain and reference when using Garden.