From 43fb5447440c213adc52fbc7e542e0608387f229 Mon Sep 17 00:00:00 2001 From: David Ball Date: Fri, 31 May 2024 02:57:54 -0400 Subject: [PATCH] Added bind mount for docker.sock. --- .env.example-linux | 1 + .env.example-windows | 1 + .gitignore | 8 ++++++++ README.md | 29 +++++++++++++++++++++++++++++ admin-api/docker.js | 2 +- docker-compose.yml | 8 +++++++- 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .env.example-linux create mode 100644 .env.example-windows create mode 100644 .gitignore diff --git a/.env.example-linux b/.env.example-linux new file mode 100644 index 0000000..7237748 --- /dev/null +++ b/.env.example-linux @@ -0,0 +1 @@ +DOCKER_SOCK_PIPE=/var/run/docker.sock diff --git a/.env.example-windows b/.env.example-windows new file mode 100644 index 0000000..b60bfd0 --- /dev/null +++ b/.env.example-windows @@ -0,0 +1 @@ +DOCKER_SOCK_PIPE=//./pipe/docker_engine diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5be9dbe --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. +# misc +.DS_Store +.env +.env.local +.env.development.local +.env.test.local +.env.production.local diff --git a/README.md b/README.md index b0e5f78..425981d 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,32 @@ This repository creates the admin user interface which serves the following purp - Enable contributors to spin up both a dev server to test their fork and a code server to edit their fork. - Enable contributors to easily access both of these interfaces. +# Example Linux .env file + + DOCKER_SOCK_PIPE=/var/run/docker.sock + +# Example Windows .env file + + DOCKER_SOCK_PIPE=//./pipe/docker_engine + +# Create a .env file + +Copy the Windows example .env file. + + copy .env.example-windows .env + +Copy the Linux example .env file. + + cp .env.example-linux .env + +# Use docker compose to bring up admin app + +Using docker compose: + + docker compose --env-file .env up --build -d + +# Use docker compose to bring down admin app + +Using docker compose: + + docker compose down diff --git a/admin-api/docker.js b/admin-api/docker.js index 1417503..11d6d31 100644 --- a/admin-api/docker.js +++ b/admin-api/docker.js @@ -1,4 +1,4 @@ const Docker = require('dockerode'); -const docker = new Docker(); +const docker = new Docker({socketPath: process.env.DOCKER_SOCK_PIPE||'/var/run/docker.sock'}); module.exports = docker; diff --git a/docker-compose.yml b/docker-compose.yml index 5c4ffc0..c8204ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,17 @@ # docker-compose.yml -version: '3' services: admin-app: build: ./admin-app + env_file: + - .env ports: - "3000:3000" + volumes: + # - "/var/run/docker.sock:/var/run/docker.sock" + - "$DOCKER_SOCK_PIPE:$DOCKER_SOCK_PIPE" admin-api: build: ./admin-api + env_file: + - .env ports: - "3001:3001"