diff --git a/.gitignore b/.gitignore index ba0f1e5..ad32e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ node_modules .DS_Store fqdn.env -/docker/certs +/dev/certs qrcode-svg/ turnserver.conf rtc_config.json diff --git a/docker/nginx-with-openssl.Dockerfile b/dev/nginx-with-openssl.Dockerfile similarity index 100% rename from docker/nginx-with-openssl.Dockerfile rename to dev/nginx-with-openssl.Dockerfile diff --git a/docker/nginx/default.conf b/dev/nginx/default.conf similarity index 100% rename from docker/nginx/default.conf rename to dev/nginx/default.conf diff --git a/docker/openssl/create.sh b/dev/openssl/create.sh old mode 100755 new mode 100644 similarity index 100% rename from docker/openssl/create.sh rename to dev/openssl/create.sh diff --git a/docker/openssl/pairdropCA.cnf b/dev/openssl/pairdropCA.cnf similarity index 100% rename from docker/openssl/pairdropCA.cnf rename to dev/openssl/pairdropCA.cnf diff --git a/docker/openssl/pairdropCert.cnf b/dev/openssl/pairdropCert.cnf similarity index 100% rename from docker/openssl/pairdropCert.cnf rename to dev/openssl/pairdropCert.cnf diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 472e001..dc02397 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -16,18 +16,18 @@ services: - "127.0.0.1:3000:3000" # Web UI. Change the port number before the last colon e.g. `127.0.0.1:9000:3000` nginx: build: - context: ./docker/ + context: dev/ dockerfile: nginx-with-openssl.Dockerfile image: "nginx-with-openssl" volumes: - ./public:/usr/share/nginx/html - - ./docker/certs:/etc/ssl/certs - - ./docker/openssl:/mnt/openssl - - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf + - ./dev/certs:/etc/ssl/certs + - ./dev/openssl:/mnt/openssl + - ./dev/nginx/default.conf:/etc/nginx/conf.d/default.conf ports: - "8080:80" - "8443:443" - env_file: ./docker/fqdn.env + env_file: dev/fqdn.env entrypoint: /mnt/openssl/create.sh command: ["nginx", "-g", "daemon off;"] restart: unless-stopped \ No newline at end of file diff --git a/docker/fqdn.env b/docker/fqdn.env deleted file mode 100644 index 3302bc9..0000000 --- a/docker/fqdn.env +++ /dev/null @@ -1 +0,0 @@ -FQDN=localhost \ No newline at end of file