diff --git a/examples/custom_config/Dockerfile b/examples/custom_config/Dockerfile deleted file mode 100644 index 054a811..0000000 --- a/examples/custom_config/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM steveltn/https-portal - -ADD ./nginx-conf/ /var/lib/nginx-conf diff --git a/examples/custom_config/docker-compose.yml b/examples/custom_config/docker-compose.yml index 2c73777..e049d96 100644 --- a/examples/custom_config/docker-compose.yml +++ b/examples/custom_config/docker-compose.yml @@ -1,9 +1,17 @@ -https-portal: - build: ./ - ports: - - 80:80 - - 443:443 - environment: - # Redirect my.example.com to https:://letsencrypt.org - # The upsteams will be available as <%= domain.upstream %> in Nginx config - DOMAINS: 'my.example.domain -> https://letsencrypt.org, another.example.domain -> https://another.upstream' +version: '3' + +services: + https-portal: + image: steveltn/https-portal:1 + ports: + - 80:80 + - 443:443 + environment: + # Redirect my.example.com to https:://letsencrypt.org + # The upsteams will be available as <%= domain.upstream %> in Nginx config + DOMAINS: 'example.com -> https://letsencrypt.org' + STAGE: local + volumes: + - ./nginx-conf/example.com.conf.erb:/var/lib/nginx-conf/example.com.conf.erb:ro + - ./nginx-conf/example.com.ssl.conf.erb:/var/lib/nginx-conf/example.com.ssl.conf.erb:ro + diff --git a/examples/custom_config/nginx-conf/my.example.com.conf.erb b/examples/custom_config/nginx-conf/example.com.conf.erb similarity index 100% rename from examples/custom_config/nginx-conf/my.example.com.conf.erb rename to examples/custom_config/nginx-conf/example.com.conf.erb diff --git a/examples/custom_config/nginx-conf/my.example.com.ssl.conf.erb b/examples/custom_config/nginx-conf/example.com.ssl.conf.erb similarity index 100% rename from examples/custom_config/nginx-conf/my.example.com.ssl.conf.erb rename to examples/custom_config/nginx-conf/example.com.ssl.conf.erb diff --git a/examples/minimal/docker-compose.yml b/examples/minimal/docker-compose.yml index 0fa135a..14795dd 100644 --- a/examples/minimal/docker-compose.yml +++ b/examples/minimal/docker-compose.yml @@ -1,10 +1,11 @@ -https-portal: - image: steveltn/https-portal - # You can build from source code rather than use the prebuilt image from Docker Hub. - # build: ../.. - ports: - - 80:80 - - 443:443 - environment: - DOMAINS: 'example.com' - PRODUCTION: 'true' +version: '3' + +services: + https-portal: + image: steveltn/https-portal:1 + ports: + - 80:80 + - 443:443 + environment: + DOMAINS: 'example.com' + STAGE: local diff --git a/examples/wordpress/docker-compose.yml b/examples/wordpress/docker-compose.yml index ad1f877..67d5274 100644 --- a/examples/wordpress/docker-compose.yml +++ b/examples/wordpress/docker-compose.yml @@ -1,29 +1,30 @@ -https-portal: - image: steveltn/https-portal - # You can build from source code rather than use the prebuilt image from Docker Hub. - # build: ../.. - ports: - - 80:80 - - 443:443 - links: - - wordpress - # Restart https-portal on failure or after Docker host restart. - restart: always - environment: - # Forward wordpress.example.com to the WordPress container. - # You can set up multiple domains at once. - DOMAINS: 'wordpress.example.com -> http://wordpress' +version: '3' - # Using staging server by default, for there is a rate limit on production. - # Uncomment to use Let's Encrypt production server. - # PRODUCTION: 'true' +services: + https-portal: + image: steveltn/https-portal:1 + ports: + - 80:80 + - 443:443 + links: + - wordpress + # Restart https-portal on failure or after Docker host restart. + restart: always + environment: + # Forward wordpress.example.com to the WordPress container. + # You can set up multiple domains at once. + DOMAINS: 'example.com -> http://wordpress' + STAGE: local + # Using staging server by default, for there is a rate limit on production. + # Uncomment to use Let's Encrypt production server. + # STAGE: production -wordpress: - image: wordpress - links: - - db:mysql + wordpress: + image: wordpress + links: + - db:mysql -db: - image: mariadb - environment: - MYSQL_ROOT_PASSWORD: '' + db: + image: mariadb + environment: + MYSQL_ROOT_PASSWORD: ''