diff --git a/.gitignore b/.gitignore index 3b11ef3..1af0e62 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ Thumbs.db ######## *.log +# Additional dirs # +################### +======= /.idea/ /src/__pycache__/ /src/Contrib/__pycache__/ diff --git a/contrib/docker-compose/README.md b/contrib/docker-compose/README.md index a043d4c..955b8de 100644 --- a/contrib/docker-compose/README.md +++ b/contrib/docker-compose/README.md @@ -31,9 +31,7 @@ NGINX Declarative API - https://github.com/fabriziofiorucci/NGINX-Declarative-AP ## How to deploy 1. Start NGINX Declarative API using the provided `nginx-dapi.sh` script -2. Start Postman using the collection provided [here](/contrib/postman) or refer to the for CI/CD integration - - [API v1](/USAGE-v1.md) - deprecated - - [API v2](/USAGE-v2.md) +2. Start Postman using the collection provided [here](/contrib/postman) ## How to run diff --git a/contrib/docker-compose/docker-compose.yaml b/contrib/docker-compose/docker-compose.yaml index 5af8a9f..ef30d7f 100644 --- a/contrib/docker-compose/docker-compose.yaml +++ b/contrib/docker-compose/docker-compose.yaml @@ -17,7 +17,12 @@ services: - redis_data:/data:rw devportal: - image: fiorucci/nginx-declarative-api-devportal:latest + # Pre-built image + #image: fiorucci/nginx-declarative-api-devportal:latest + image: nginx-declarative-api-devportal + build: + context: ../devportal/ + dockerfile: Dockerfile user: "${USERID}:${USERGROUP}" container_name: "devportal" restart: always @@ -27,7 +32,12 @@ services: - dapi-network nginx-dapi: - image: fiorucci/nginx-declarative-api:latest + # Pre-built image + #image: fiorucci/nginx-declarative-api:latest + image: nginx-declarative-api + build: + context: ../../ + dockerfile: Dockerfile user: "${USERID}:${USERGROUP}" container_name: "nginx-dapi" restart: always