diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fa151cd --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# Environment +*.env +!template.env \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3ae2878..8f9ec21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,18 @@ -# name: dean -# services: -# nginx: -# # USES .ENV FROM THE MAIN DIR PATH, NOT NGINX -# extends: -# file: ./nginx/docker-compose.yml -# service: nginx -# verdaccio: -# extends: -# file: ./verdaccio/docker-compose.yml -# service: verdaccio +# USES .ENV FROM THE MAIN DIR PATH, NOT NGINX +services: + nginx: + extends: + file: ./nginx/docker-compose.yml + service: nginx + + verdaccio-live: + extends: + file: ./verdaccio/docker-compose.yml + service: verdaccio-live + verdaccio-dev: + extends: + file: ./verdaccio/docker-compose.yml + service: verdaccio-dev # ## ONLY USES .ENV FROM THE FIRST PATH # # include: diff --git a/template.env b/template.env new file mode 100644 index 0000000..16b5f76 --- /dev/null +++ b/template.env @@ -0,0 +1,37 @@ +# ================================================== +# NGINX +# ================================================== + +CERTS=~/Documents/.certs/deanayalon.com +HTTP_PORT= + + +# ================================================== +# VERDACCIO +# ================================================== + +VERDACCIO_ENV=0.9 + +# ! DEV VARIABLES WILL DEFAULT TO LIVE VALUES IF LEFT EMPTY + # Defining different values will allow the dev container to run on the same machine without disturbing the live production server + +# The domain on which the service will be hosted +VERDACCIO_DOMAIN= +VERDACCIO_DEV_DOMAIN= + +# Mount paths +## Will store users and packages +VERDACCIO_STORAGE= +VERDACCIO_DEV_STORAGE= +## SSL certificates for HTTPS +VERDACCIO_CERTS= +VERDACCIO_DEV_CERTS= + +# Port mapping - Default: 4873 +VERDACCIO_PORT=4873 +VERDACCIO_DEV_PORT= + +# If using a proxy, define the port for the healthcheck to use + # If no value is defined, the verdaccio port is used as a default value. (live/dev, respectively) +VERDACCIO_PROXY_PORT=443 +## The container healthcheck sends a request to https://DOMAIN:PROXY_PORT \ No newline at end of file diff --git a/verdaccio b/verdaccio index f2a2678..a010b3f 160000 --- a/verdaccio +++ b/verdaccio @@ -1 +1 @@ -Subproject commit f2a267858c53c7ffa2dfb48c8d317ade70027536 +Subproject commit a010b3f0c057978bfe6587aa13b90e0fb45903d6