Version bump

Ignore default location when defined in advanced config (#79 )
2019-02-27 17:52:30 +10:00 · 2019-02-25 10:42:16 +10:00 · 2019-02-25 10:34:55 +10:00 · 2019-02-20 08:25:12 +10:00 · 2019-02-20 14:35:10 +10:00 · 2019-02-20 08:25:12 +10:00
10 changed files with 173 additions and 79 deletions
--- a/Dockerfile.armv6
+++ b/Dockerfile.armv6
@ -0,0 +1,38 @@
+FROM jc21/nginx-proxy-manager-base:armv6
+
+MAINTAINER Jamie Curnow <jc@jc21.com>
+LABEL maintainer="Jamie Curnow <jc@jc21.com>"
+
+ENV SUPPRESS_NO_CONFIG_WARNING=1
+ENV S6_FIX_ATTRS_HIDDEN=1
+RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
+
+# Nginx, Node and required packages should already be installed from the base image
+
+# root filesystem
+COPY rootfs /
+
+# s6 overlay
+RUN curl -L -o /tmp/s6-overlay-arm.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-arm.tar.gz" \
+    && tar xzf /tmp/s6-overlay-arm.tar.gz -C /
+
+# App
+ENV NODE_ENV=production
+
+ADD dist                /app/dist
+ADD node_modules        /app/node_modules
+ADD src/backend         /app/src/backend
+ADD package.json        /app/package.json
+ADD knexfile.js         /app/knexfile.js
+
+# Volumes
+VOLUME [ "/data", "/etc/letsencrypt" ]
+CMD [ "/init" ]
+
+# Ports
+EXPOSE 80
+EXPOSE 81
+EXPOSE 443
+EXPOSE 9876
+
+HEALTHCHECK --interval=15s --timeout=3s CMD curl -f http://localhost:9876/health || exit 1
--- a/173
+++ b/173
@ -12,11 +12,38 @@ pipeline {
    TEMP_IMAGE_ARM64 = "nginx-proxy-manager-arm64-build_${BUILD_NUMBER}"
    TAG_VERSION      = getPackageVersion()
    MAJOR_VERSION    = "2"
+    BRANCH_LOWER     = "${BRANCH_NAME.toLowerCase()}"
  }
  stages {
-    stage('Prepare') {
+    stage('Build PR') {
+      when {
+        changeRequest()
+      }
      steps {
-        sh 'docker pull $DOCKER_CI_TOOLS'
+        ansiColor('xterm') {
+          // Codebase
+          sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
+          sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
+          sh 'rm -rf node_modules'
+          sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
+          sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} node-prune'
+
+          // Docker Build
+          sh 'docker build --pull --no-cache --squash --compress -t ${TEMP_IMAGE} .'
+
+          // Dockerhub
+          sh 'docker tag ${TEMP_IMAGE} docker.io/jc21/${IMAGE}:github-${BRANCH_LOWER}'
+          withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
+            sh "docker login -u '${duser}' -p '${dpass}'"
+            sh 'docker push docker.io/jc21/${IMAGE}:github-${BRANCH_LOWER}'
+          }
+
+          sh 'docker rmi ${TEMP_IMAGE}'
+
+          script {
+            def comment = pullRequest.comment("Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`")
+          }
+        }
      }
    }
    stage('Build Develop') {
@ -26,30 +53,30 @@ pipeline {
      steps {
        ansiColor('xterm') {
          // Codebase
-          sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install'
-          sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE npm run-script build'
+          sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
+          sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
          sh 'rm -rf node_modules'
-          sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install --prod'
-          sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
+          sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
+          sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} node-prune'

          // Docker Build
-          sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE .'
+          sh 'docker build --pull --no-cache --squash --compress -t ${TEMP_IMAGE} .'

          // Dockerhub
-          sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:develop'
+          sh 'docker tag ${TEMP_IMAGE} docker.io/jc21/${IMAGE}:develop'
          withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-            sh "docker login -u '${duser}' -p '$dpass'"
-            sh 'docker push docker.io/jc21/$IMAGE:develop'
+            sh "docker login -u '${duser}' -p '${dpass}'"
+            sh 'docker push docker.io/jc21/${IMAGE}:develop'
          }

          // Private Registry
-          sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:develop'
+          sh 'docker tag ${TEMP_IMAGE} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:develop'
          withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-            sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
-            sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:develop'
+            sh "docker login -u '${duser}' -p '${dpass}' ${DOCKER_PRIVATE_REGISTRY}"
+            sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:develop'
          }

-          sh 'docker rmi $TEMP_IMAGE'
+          sh 'docker rmi ${TEMP_IMAGE}'
        }
      }
    }
@ -62,40 +89,40 @@ pipeline {
          steps {
            ansiColor('xterm') {
              // Codebase
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install'
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE npm run-script build'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} npm run-script build'
              sh 'rm -rf node_modules'
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install --prod'
-              sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE} yarn install --prod'
+              sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} node-prune'

              // Docker Build
-              sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE .'
+              sh 'docker build --pull --no-cache --squash --compress -t ${TEMP_IMAGE} .'

              // Dockerhub
-              sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:$TAG_VERSION'
-              sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:$MAJOR_VERSION'
-              sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:latest'
+              sh 'docker tag ${TEMP_IMAGE} docker.io/jc21/${IMAGE}:${TAG_VERSION}'
+              sh 'docker tag ${TEMP_IMAGE} docker.io/jc21/${IMAGE}:${MAJOR_VERSION}'
+              sh 'docker tag ${TEMP_IMAGE} docker.io/jc21/${IMAGE}:latest'

              withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-                sh "docker login -u '${duser}' -p '$dpass'"
-                sh 'docker push docker.io/jc21/$IMAGE:$TAG_VERSION'
-                sh 'docker push docker.io/jc21/$IMAGE:$MAJOR_VERSION'
-                sh 'docker push docker.io/jc21/$IMAGE:latest'
+                sh "docker login -u '${duser}' -p '${dpass}'"
+                sh 'docker push docker.io/jc21/${IMAGE}:${TAG_VERSION}'
+                sh 'docker push docker.io/jc21/${IMAGE}:${MAJOR_VERSION}'
+                sh 'docker push docker.io/jc21/${IMAGE}:latest'
              }

              // Private Registry
-              sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION'
-              sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION'
-              sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest'
+              sh 'docker tag ${TEMP_IMAGE} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${TAG_VERSION}'
+              sh 'docker tag ${TEMP_IMAGE} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${MAJOR_VERSION}'
+              sh 'docker tag ${TEMP_IMAGE} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:latest'

              withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-                sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION'
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION'
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest'
+                sh "docker login -u '${duser}' -p '${dpass}' ${DOCKER_PRIVATE_REGISTRY}"
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${TAG_VERSION}'
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${MAJOR_VERSION}'
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:latest'
              }

-              sh 'docker rmi $TEMP_IMAGE'
+              sh 'docker rmi ${TEMP_IMAGE}'
            }
          }
        }
@ -109,39 +136,39 @@ pipeline {
          steps {
            ansiColor('xterm') {
              // Codebase
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:armhf yarn install'
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:armhf npm run-script build'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE}:armhf yarn install'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE}:armhf npm run-script build'
              sh 'rm -rf node_modules'
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:armhf yarn install --prod'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE}:armhf yarn install --prod'

              // Docker Build
-              sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_ARM -f Dockerfile.armhf .'
+              sh 'docker build --pull --no-cache --squash --compress -t ${TEMP_IMAGE_ARM} -f Dockerfile.armhf .'

              // Dockerhub
-              sh 'docker tag $TEMP_IMAGE_ARM docker.io/jc21/$IMAGE:$TAG_VERSION-armhf'
-              sh 'docker tag $TEMP_IMAGE_ARM docker.io/jc21/$IMAGE:$MAJOR_VERSION-armhf'
-              sh 'docker tag $TEMP_IMAGE_ARM docker.io/jc21/$IMAGE:latest-armhf'
+              sh 'docker tag ${TEMP_IMAGE_ARM} docker.io/jc21/${IMAGE}:${TAG_VERSION}-armhf'
+              sh 'docker tag ${TEMP_IMAGE_ARM} docker.io/jc21/${IMAGE}:${MAJOR_VERSION}-armhf'
+              sh 'docker tag ${TEMP_IMAGE_ARM} docker.io/jc21/${IMAGE}:latest-armhf'

              withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-                sh "docker login -u '${duser}' -p '$dpass'"
-                sh 'docker push docker.io/jc21/$IMAGE:$TAG_VERSION-armhf'
-                sh 'docker push docker.io/jc21/$IMAGE:$MAJOR_VERSION-armhf'
-                sh 'docker push docker.io/jc21/$IMAGE:latest-armhf'
+                sh "docker login -u '${duser}' -p '${dpass}'"
+                sh 'docker push docker.io/jc21/${IMAGE}:${TAG_VERSION}-armhf'
+                sh 'docker push docker.io/jc21/${IMAGE}:${MAJOR_VERSION}-armhf'
+                sh 'docker push docker.io/jc21/${IMAGE}:latest-armhf'
              }

              // Private Registry
-              sh 'docker tag $TEMP_IMAGE_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-armhf'
-              sh 'docker tag $TEMP_IMAGE_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-armhf'
-              sh 'docker tag $TEMP_IMAGE_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-armhf'
+              sh 'docker tag ${TEMP_IMAGE_ARM} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${TAG_VERSION}-armhf'
+              sh 'docker tag ${TEMP_IMAGE_ARM} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${MAJOR_VERSION}-armhf'
+              sh 'docker tag ${TEMP_IMAGE_ARM} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:latest-armhf'

              withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-                sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-armhf'
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-armhf'
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-armhf'
+                sh "docker login -u '${duser}' -p '${dpass}' ${DOCKER_PRIVATE_REGISTRY}"
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${TAG_VERSION}-armhf'
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${MAJOR_VERSION}-armhf'
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:latest-armhf'
              }

-              sh 'docker rmi $TEMP_IMAGE_ARM'
+              sh 'docker rmi ${TEMP_IMAGE_ARM}'
            }
          }
        }
@ -155,39 +182,39 @@ pipeline {
          steps {
            ansiColor('xterm') {
              // Codebase
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:arm64 yarn install'
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:arm64 npm run-script build'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE}:arm64 yarn install'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE}:arm64 npm run-script build'
              sh 'sudo rm -rf node_modules'
-              sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:arm64 yarn install --prod'
+              sh 'docker run --rm -v $(pwd):/app -w /app ${BASE_IMAGE}:arm64 yarn install --prod'

              // Docker Build
-              sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_ARM64 -f Dockerfile.arm64 .'
+              sh 'docker build --pull --no-cache --squash --compress -t ${TEMP_IMAGE_ARM64} -f Dockerfile.arm64 .'

              // Dockerhub
-              sh 'docker tag $TEMP_IMAGE_ARM64 docker.io/jc21/$IMAGE:$TAG_VERSION-arm64'
-              sh 'docker tag $TEMP_IMAGE_ARM64 docker.io/jc21/$IMAGE:$MAJOR_VERSION-arm64'
-              sh 'docker tag $TEMP_IMAGE_ARM64 docker.io/jc21/$IMAGE:latest-arm64'
+              sh 'docker tag ${TEMP_IMAGE_ARM64} docker.io/jc21/${IMAGE}:${TAG_VERSION}-arm64'
+              sh 'docker tag ${TEMP_IMAGE_ARM64} docker.io/jc21/${IMAGE}:${MAJOR_VERSION}-arm64'
+              sh 'docker tag ${TEMP_IMAGE_ARM64} docker.io/jc21/${IMAGE}:latest-arm64'

              withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-                sh "docker login -u '${duser}' -p '$dpass'"
-                sh 'docker push docker.io/jc21/$IMAGE:$TAG_VERSION-arm64'
-                sh 'docker push docker.io/jc21/$IMAGE:$MAJOR_VERSION-arm64'
-                sh 'docker push docker.io/jc21/$IMAGE:latest-arm64'
+                sh "docker login -u '${duser}' -p '${dpass}'"
+                sh 'docker push docker.io/jc21/${IMAGE}:${TAG_VERSION}-arm64'
+                sh 'docker push docker.io/jc21/${IMAGE}:${MAJOR_VERSION}-arm64'
+                sh 'docker push docker.io/jc21/${IMAGE}:latest-arm64'
              }

              // Private Registry
-              sh 'docker tag $TEMP_IMAGE_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-arm64'
-              sh 'docker tag $TEMP_IMAGE_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-arm64'
-              sh 'docker tag $TEMP_IMAGE_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-arm64'
+              sh 'docker tag ${TEMP_IMAGE_ARM64} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${TAG_VERSION}-arm64'
+              sh 'docker tag ${TEMP_IMAGE_ARM64} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${MAJOR_VERSION}-arm64'
+              sh 'docker tag ${TEMP_IMAGE_ARM64} ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:latest-arm64'

              withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-                sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-arm64'
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-arm64'
-                sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-arm64'
+                sh "docker login -u '${duser}' -p '${dpass}' ${DOCKER_PRIVATE_REGISTRY}"
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${TAG_VERSION}-arm64'
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:${MAJOR_VERSION}-arm64'
+                sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/${IMAGE}:latest-arm64'
              }

-              sh 'docker rmi $TEMP_IMAGE_ARM64'
+              sh 'docker rmi ${TEMP_IMAGE_ARM64}'

              // Hack to clean up ec2 instance for next build
              sh 'sudo chown -R ec2-user:ec2-user *'
@ -210,7 +237,7 @@ pipeline {
 }

 def getPackageVersion() {
-  ver = sh(script: 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS bash -c "cat /data/package.json|jq -r \'.version\'"', returnStdout: true)
+  ver = sh(script: 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} bash -c "cat /data/package.json|jq -r \'.version\'"', returnStdout: true)
  return ver.trim()
 }

--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 # Nginx Proxy Manager

-![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)

--- a/doc/DOCKERHUB.md
+++ b/doc/DOCKERHUB.md
@ -2,7 +2,7 @@

 # Nginx Proxy Manager

-![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)

@ -16,6 +16,7 @@ running at home or otherwise, including free SSL, without having to know too muc

 * latest 2, 2.x.x ([Dockerfile](https://github.com/jc21/nginx-proxy-manager/blob/master/Dockerfile))
 * latest-armhf, 2-armhf, 2.x.x-armhf ([Dockerfile](https://github.com/jc21/nginx-proxy-manager/blob/master/Dockerfile.armhf))
+* latest-arm64, 2-arm64, 2.x.x-arm64 ([Dockerfile](https://github.com/jc21/nginx-proxy-manager/blob/master/Dockerfile.arm64))
 * 1, 1.x.x ([Dockerfile](https://github.com/jc21/nginx-proxy-manager/blob/1.1.2/Dockerfile))
 * 1-armhf, 1.x.x-armhf ([Dockerfile](https://github.com/jc21/nginx-proxy-manager/blob/1.1.2/Dockerfile.armhf))

--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "nginx-proxy-manager",
-  "version": "2.0.9",
+  "version": "2.0.10",
  "description": "A beautiful interface for creating Nginx endpoints",
  "main": "src/backend/index.js",
  "devDependencies": {
--- a/src/backend/internal/nginx.js
+++ b/src/backend/internal/nginx.js
@ -1,5 +1,3 @@
-'use strict';
-
 const _          = require('lodash');
 const fs         = require('fs');
 const Liquid     = require('liquidjs');
@ -92,7 +90,7 @@ const internalNginx = {
            })
            .then(() => {
                return combined_meta;
-            })
+            });
    },

    /**
@ -146,6 +144,7 @@ const internalNginx = {
        return new Promise((resolve, reject) => {
            let template = null;
            let filename = internalNginx.getConfigName(host_type, host.id);
+
            try {
                template = fs.readFileSync(__dirname + '/../templates/' + host_type + '.conf', {encoding: 'utf8'});
            } catch (err) {
@ -153,6 +152,12 @@ const internalNginx = {
                return;
            }

+            // Manipulate the data a bit before sending it to the template
+            host.use_default_location = true;
+            if (typeof host.advanced_config !== 'undefined' && host.advanced_config) {
+                host.use_default_location = !internalNginx.advancedConfigHasDefaultLocation(host.advanced_config);
+            }
+
            renderEngine
                .parseAndRender(template, host)
                .then(config_text => {
@ -312,6 +317,14 @@ const internalNginx = {
        });

        return Promise.all(promises);
+    },
+
+    /**
+     * @param   {string}  config
+     * @returns {boolean}
+     */
+    advancedConfigHasDefaultLocation: function (config) {
+        return !!config.match(/^(?:.*;)?\s*?location\s*?\/\s*?{/im);
    }
 };

--- a/src/backend/templates/dead_host.conf
+++ b/src/backend/templates/dead_host.conf
@ -10,10 +10,13 @@ server {

 {{ advanced_config }}

+{% if use_default_location %}
  location / {
 {% include "_forced_ssl.conf" %}
 {% include "_hsts.conf" %}
    return 404;
  }
+{% endif %}
+
 }
 {% endif %}
--- a/src/backend/templates/proxy_host.conf
+++ b/src/backend/templates/proxy_host.conf
@ -16,6 +16,7 @@ server {

 {{ advanced_config }}

+{% if use_default_location %}
  location / {
    {%- if access_list_id > 0 -%}
    # Access List
@ -35,5 +36,7 @@ server {
    # Proxy!
    include conf.d/include/proxy.conf;
  }
+{% endif %}
+
 }
 {% endif %}
--- a/src/backend/templates/redirection_host.conf
+++ b/src/backend/templates/redirection_host.conf
@ -12,6 +12,7 @@ server {

 {{ advanced_config }}

+{% if use_default_location %}
  location / {
 {% include "_forced_ssl.conf" %}
 {% include "_hsts.conf" %}
@ -22,5 +23,7 @@ server {
        return 301 $scheme://{{ forward_domain_name }};
    {% endif %}
  }
+{% endif %}
+
 }
 {% endif %}
--- a/src/frontend/js/app/nginx/proxy/form.ejs
+++ b/src/frontend/js/app/nginx/proxy/form.ejs
@ -152,6 +152,12 @@
                <div role="tabpanel" class="tab-pane" id="advanced">
                    <div class="row">
                        <div class="col-md-12">
+                            <p>Nginx variables available to you are:</p>
+                            <ul class="text-monospace">
+                                <li>$server          # Host/IP</li>
+                                <li>$port            # Port Number</li>
+                                <li>$forward_scheme  # http or https</li>
+                            </ul>
                            <div class="form-group mb-0">
                                <label class="form-label"><%- i18n('all-hosts', 'advanced-config') %></label>
                                <textarea name="advanced_config" rows="8" class="form-control text-monospace" placeholder="# <%- i18n('all-hosts', 'advanced-warning') %>"><%- advanced_config %></textarea>
Author	SHA1	Message	Date
Jamie Curnow	418899d425	Version bump	2019-02-27 17:52:30 +10:00
jc21	e7379e3683	Ignore default location when defined in advanced config (#79 )	2019-02-25 10:42:16 +10:00
jc21	29bebcc73e	Ignore default location when defined in advanced config (#79 )	2019-02-25 10:34:55 +10:00
Jamie Curnow	26064b20b8	Fix PR docker image pushing to wrong repo	2019-02-20 08:25:12 +10:00
jc21	3dc9b20543	CI Improvements (#77 )	2019-02-20 14:35:10 +10:00
Jamie Curnow	444dbd5160	Added PR build steps to CI	2019-02-20 08:25:12 +10:00
Jamie Curnow	c2f99e253c	Merge branch 'master' of github.com:jc21/nginx-proxy-manager	2019-02-20 10:04:16 +10:00
Jamie Curnow	5c7fb7b698	Added armv6 Dockerfile	2019-02-20 08:25:12 +10:00
jc21	733d7d9583	Update DOCKERHUB.md	2019-02-19 17:05:26 +10:00