Skip to content

Commit 28d9702

Browse files
committed
refactor: use dedicated name for Docker and Podman socket
This will make things clearer when deployed.
1 parent 0a49e62 commit 28d9702

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

helm-chart/binderhub/files/binderhub_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def get_value(key, default=None):
5050
if imageBuilderType in ["dind", "pink"]:
5151
hostSocketDir = get_value(f"{imageBuilderType}.hostSocketDir")
5252
if hostSocketDir:
53-
c.BinderHub.build_docker_host = f"unix://{hostSocketDir}/docker.sock"
54-
53+
socketname = "docker" if imageBuilderType == "dind" else "podman"
54+
c.BinderHub.build_docker_host = f"unix://{hostSocketDir}/{socketname}.sock"
5555

5656
if c.BinderHub.auth_enabled:
5757
hub_url = urlparse(c.BinderHub.hub_url)

helm-chart/binderhub/templates/container-builder/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ spec:
7272
- system
7373
- service
7474
- --time=0
75-
- unix://{{ $builder.hostSocketDir }}/docker.sock
75+
- unix://{{ $builder.hostSocketDir }}/podman.sock
7676
securityContext:
7777
privileged: true
7878
runAsUser: 0

helm-chart/binderhub/templates/image-cleaner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ spec:
9393
type: DirectoryOrCreate
9494
- name: socket-pink
9595
hostPath:
96-
path: {{ .Values.pink.hostSocketDir }}/docker.sock
96+
path: {{ .Values.pink.hostSocketDir }}/podman.sock
9797
type: Socket
9898
{{- end }}
9999

0 commit comments

Comments
 (0)