Fix Docker socket path for rootless Docker

This commit is contained in:
kert
2026-02-05 18:12:55 -05:00
parent 3dfd92a356
commit 0942e6a712
2 changed files with 13 additions and 13 deletions

View File

@@ -5,14 +5,14 @@ steps:
- name: validate - name: validate
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker compose config --quiet - docker compose config --quiet
- name: build-notebooks - name: build-notebooks
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker build -t localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} ./notebooks - docker build -t localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} ./notebooks
- docker tag localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/notebooks:latest - docker tag localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/notebooks:latest
@@ -22,7 +22,7 @@ steps:
- name: build-zotero - name: build-zotero
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker build -t localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} ./zotero - docker build -t localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} ./zotero
- docker tag localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/zotero:latest - docker tag localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/zotero:latest
@@ -32,7 +32,7 @@ steps:
- name: scan-notebooks - name: scan-notebooks
image: aquasec/trivy:latest image: aquasec/trivy:latest
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} - trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8}
- trivy image --severity HIGH,CRITICAL --format json -o notebooks-scan.json localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} - trivy image --severity HIGH,CRITICAL --format json -o notebooks-scan.json localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8}
@@ -42,7 +42,7 @@ steps:
- name: scan-zotero - name: scan-zotero
image: aquasec/trivy:latest image: aquasec/trivy:latest
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} - trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8}
- trivy image --severity HIGH,CRITICAL --format json -o zotero-scan.json localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} - trivy image --severity HIGH,CRITICAL --format json -o zotero-scan.json localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8}
@@ -69,7 +69,7 @@ steps:
- name: push-images - name: push-images
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
environment: environment:
REGISTRY_USER: REGISTRY_USER:
from_secret: registry_user from_secret: registry_user
@@ -88,7 +88,7 @@ steps:
- name: deploy - name: deploy
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker compose pull - docker compose pull
- docker compose up -d - docker compose up -d

View File

@@ -5,7 +5,7 @@ steps:
- name: build-notebooks - name: build-notebooks
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker build -t localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} ./notebooks - docker build -t localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} ./notebooks
- docker tag localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/notebooks:latest - docker tag localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/notebooks:latest
@@ -13,7 +13,7 @@ steps:
- name: build-zotero - name: build-zotero
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker build -t localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} ./zotero - docker build -t localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} ./zotero
- docker tag localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/zotero:latest - docker tag localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} localhost:3000/homelab/zotero:latest
@@ -21,21 +21,21 @@ steps:
- name: scan-notebooks - name: scan-notebooks
image: aquasec/trivy:latest image: aquasec/trivy:latest
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8} - trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/notebooks:${CI_COMMIT_SHA:0:8}
- name: scan-zotero - name: scan-zotero
image: aquasec/trivy:latest image: aquasec/trivy:latest
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8} - trivy image --severity HIGH,CRITICAL --exit-code 0 --format table localhost:3000/homelab/zotero:${CI_COMMIT_SHA:0:8}
- name: push-images - name: push-images
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
environment: environment:
REGISTRY_USER: REGISTRY_USER:
from_secret: registry_user from_secret: registry_user
@@ -51,7 +51,7 @@ steps:
- name: deploy - name: deploy
image: docker:cli image: docker:cli
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /run/user/1000/docker.sock:/var/run/docker.sock
commands: commands:
- docker compose pull - docker compose pull
- docker compose up -d - docker compose up -d