Jafner/Jafner.net
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases Wiki Activity

Reconcile readme with docker-compose.yml

Browse Source 
Also fix broken PUID/PGID env vars
This commit is contained in:
Jafner 2021-09-09 16:03:02 -07:00
parent 8a7cb43dd0
commit c893f77e04
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
5etools-docker/README.md
View File

@ -43,25 +43,20 @@ However, any instructions which work for the base `httpd` (Apache) image, should
Create the `~/5etools-docker/docker-compose.yml` file with your preferred text editor. Then add the following contents: Create the `~/5etools-docker/docker-compose.yml` file with your preferred text editor. Then add the following contents:
```yml ```yml
version: '3' version: "3"
services: services:
5etools: 5etools-docker:
image: jafner/5etools-docker container_name: 5etools-docker
container_name: 5etools-docker image: jafner/5etools-docker:latest
volumes: volumes:
# to switch from a Docker-managed volume to a host directory mapping, - ~/5etools-docker/htdocs:/usr/local/apache2/htdocs
# comment out the "- 5etools:..." line, environment:
# and uncomment the "- ~/5etools-docker/htdocs:..." line - IMG=false # set to true to download images
# make sure the ~/5etools-docker/htdocs/download folder exists before onlining the stack - PUID=1000
- 5etools:/usr/local/apache2/htdocs # comment this line - PGID=1000
#- ~/5etools-docker/htdocs:/usr/local/apache2/htdocs # uncomment this line
ports:
- 80:80
volumes:
5etools:
``` ```
This version has a persistent Docker-managed volume. If you would like to auto-load homebrew, you will need to switch to a host directory mapping, following the instructions in the Compose file. If you would like to auto-load homebrew, you will need to follow the instructions in the Compose file.
# Auto-loading homebrew # Auto-loading homebrew
To use auto-loading homebrew, you will need to use a host directory mapping as described above. To use auto-loading homebrew, you will need to use a host directory mapping as described above.

8
5etools-docker/docker-compose.yml
View File

@ -2,10 +2,10 @@ version: "3"
services: services:
5etools-docker: 5etools-docker:
container_name: 5etools-docker container_name: 5etools-docker
image: joeyhafner/5etools-docker:latest image: jafner/5etools-docker:latest
volumes: volumes:
- ${PWD}/htdocs:/usr/local/apache2/htdocs # this assumes your docker-compose.yml file is inside a "5etools-docker" directory. - ~/5etools-docker/htdocs:/usr/local/apache2/htdocs
environment: environment:
- IMG=true - IMG=true
- PUID=${id -u} # this sets the user ID (uid) to that of the user running the command - PUID=1000
- PGID=${id -g} # this sets the group ID (gid) to that of the user running the command - PGID=1000