From b9c637c4324c4a1a412a85bbb9f7d6cef53d12d7 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Thu, 2 Aug 2018 16:56:04 -0400 Subject: [PATCH 1/9] automate ngrok mods for self-hosted purposes --- .dockerignore | 3 ++ .gitignore | 4 ++ Dockerfile | 16 +++++++ Jenkinsfile | 93 +++++++++++++++++++++++++++++++++++++ Makefile | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++ entrypoint.sh | 9 ++++ 6 files changed, 251 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100755 entrypoint.sh diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..6d9c8a6d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.scannerwork +/? +letsencrypt diff --git a/.gitignore b/.gitignore index 7d65a582..6bfe2d87 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,7 @@ src/launchpad.net src/gopkg.in src/ngrok/client/assets/ src/ngrok/server/assets/ +.scannerwork +/? +letsencrypt +.cache diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..6eec2752 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +FROM intersect/debian:latest + +COPY entrypoint.sh /entrypoint.sh + +COPY bin/ngrokd /usr/local/bin/ngrokd + +ENTRYPOINT ["/entrypoint.sh"] + +ARG GIT_COMMIT +ARG BUILD_NUMBER + +LABEL GIT_COMMIT ${GIT_COMMIT} +LABEL BUILD_NUMBER ${BUILD_NUMBER} + +ENV GIT_COMMIT ${GIT_COMMIT} +ENV BUILD_NUMBER ${BUILD_NUMBER} diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..bc16b414 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,93 @@ +pipeline { + agent { + label 'docker-migration' + } + options { + timestamps() + } + environment { + HELLO = 'world' + } + stages { + stage('Root CA') { + sh 'make letsencrypt-root' + } + stage('Build Linux') { + environment { + GOOS='linux' + GOARCH='amd64' + } + steps { + lock(resource: "${JOB_NAME}-linux") { + milestone(ordinal: 20, label: 'linux milestone') + sh 'make release-server' + sh 'make release-client' + } + } + } + stage('Build Darwin') { + environment { + GOOS='darwin' + GOARCH='amd64' + } + steps { + lock(resource: "${job_name}-darwin") { + echo "obtained lock: ${job_name}-build-darwin" + milestone(ordinal: 30, label: 'build darwin milestone') + sh 'make release-server' + sh 'make release-client' + archiveartifacts artifacts: 'bin/darwin_amd64/ngrokd', fingerprint: true + archiveartifacts artifacts: 'bin/darwin_amd64/ngrok', fingerprint: true + } + } + } + stage('Build Docker') { + steps { + lock(resource: "${job_name}-build-docker") { + echo "obtained lock: ${job_name}-build-docker" + milestone(ordinal: 40, label: 'build docker') + sh 'make docker-image' + } + } + } + stage('Sonarqube') { + steps { + lock(resource: "${JOB_NAME}-sonarqube") { + echo "obtained lock: ${JOB_NAME}-sonarqube" + milestone(ordinal: 20, label: 'sonarqube milestone') + sh 'make docker-sonar' + } + } + } + stage('Tag') { + when { + expression { BRANCH_NAME ==~ /master/ } + } + steps { + milestone(ordinal: 30, label: 'docker tag milestone') + sh 'make docker-tag' + } + } + stage('Push') { + when { + expression { BRANCH_NAME ==~ /master/ } + } + steps { + milestone(ordinal: 40, label: 'docker push milestone') + sh ''' + eval "$(aws ecr get-login --region "$AWS_ECR_REGION" --registry-ids "$AWS_ECR_REGISTRY_ID" | sed 's/-e none //')" + ''' + sh 'make ecr-repository' + sh 'make docker-push' + } + } + } + post { + failure { + slackSend(color: '#E7433E', message: "FAILED: ${JOB_NAME} #${BUILD_NUMBER} (<${BUILD_URL}|Open>)") + } + aborted { + slackSend(color: '#930DFF', message: "ABORTED: ${JOB_NAME} #${BUILD_NUMBER} (<${BUILD_URL}|Open>)") + } + } +} diff --git a/Makefile b/Makefile index 2ef67a4a..a1978b88 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,61 @@ +SHELL = /usr/bin/env bash + +DOMAIN = ngrok.bnotions.com +EMAIL = softwareadmin@bnotions.com +CLIENT_NAME = intersect +PROJECT_NAME = ngrok +DOCKER_NAME = $(CLIENT_NAME)/$(PROJECT_NAME) + +ifndef GIT_COMMIT + GIT_COMMIT = $(shell git rev-parse HEAD) +endif + +ifndef BRANCH_NAME + BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD) +endif + +ifndef TAG + TAG = $(subst /,-,$(BRANCH_NAME)) +endif + +ifndef REPOSITORY + ifdef AWS_ECR_REGISTRY_ID + REPOSITORY = $(AWS_ECR_REGISTRY_ID).dkr.ecr.$(AWS_ECR_REGION).amazonaws.com + else + REPOSITORY = localhost + endif +endif + +ifndef STACK_NAME + STACK_NAME = $(CLIENT_NAME)-$(PROJECT_NAME)-$(TAG) +endif + +ifndef STACK_FILE + STACK_FILE = deploy-stack.yml +endif + +ifndef SONAR_HOST + SONAR_HOST = https://sonar.bnotions.com +endif + +ifndef SONAR_LOGIN + SONAR_LOGIN = nil +endif + .PHONY: default server client deps fmt clean all release-all assets client-assets server-assets contributors + export GOPATH:=$(shell pwd) +export CLIENT_NAME +export PROJECT_NAME +export DOCKER_NAME +export GIT_COMMIT +export TAG +export REPOSITORY +export BUILD_NUMBER +export STACK_FILE +export STACK_NAME +export SONAR_HOST +export SONAR_LOGIN BUILDTAGS=debug default: all @@ -43,6 +99,76 @@ release-all: fmt release-client release-server all: fmt client server +letsencrypt: + docker run -it --rm \ + -v "$$PWD/letsencrypt:/etc/letsencrypt" \ + certbot/certbot certonly \ + --manual \ + -d *.$(DOMAIN) \ + -d $(DOMAIN) \ + --preferred-challenges dns \ + --email $(EMAIL) \ + --agree-tos + +letsencrypt-root: + wget -qO assets/client/tls/ngrokroot.crt https://letsencrypt.org/certs/letsencryptauthorityx3.pem + +docker-release: + docker run --rm \ + --userns host \ + --user $$(id -u $$USER) \ + --volume "$$PWD":/usr/src/app \ + --workdir /usr/src/app \ + -e HOME=/usr/src/app \ + 108026493146.dkr.ecr.us-east-1.amazonaws.com/intersect/golang:latest \ + make release-server + + +docker-image: + docker build \ + --build-arg BUILD_NUMBER \ + --build-arg GIT_COMMIT \ + --build-arg DOMAIN=$(DOMAIN) \ + --tag "$$DOCKER_NAME:$$TAG" . + +docker-tag: + docker tag "$$DOCKER_NAME:$$TAG" "$$REPOSITORY/$$DOCKER_NAME:$$GIT_COMMIT" + docker tag "$$DOCKER_NAME:$$TAG" "$$REPOSITORY/$$DOCKER_NAME:$$TAG" + @echo --- + @echo Tagged: "$$REPOSITORY/$$DOCKER_NAME:$$GIT_COMMIT" + @echo Tagged: "$$REPOSITORY/$$DOCKER_NAME:$$TAG" + +docker-push: + docker push "$$REPOSITORY/$$DOCKER_NAME:$$GIT_COMMIT" + docker push "$$REPOSITORY/$$DOCKER_NAME:$$TAG" + @echo --- + @echo Pushed: "$$REPOSITORY/$$DOCKER_NAME:$$GIT_COMMIT" + @echo Pushed: "$$REPOSITORY/$$DOCKER_NAME:$$TAG" + +docker-sonar: + docker pull 108026493146.dkr.ecr.us-east-1.amazonaws.com/intersect/sonar-scanner:latest + docker run --rm \ + --userns host \ + --user $$(id -u $$USER) \ + --volume "$$PWD":/usr/src/app \ + --workdir /usr/src/app \ + 108026493146.dkr.ecr.us-east-1.amazonaws.com/intersect/sonar-scanner:latest \ + -D sonar.host.url="$$SONAR_HOST" \ + -D sonar.login="$$SONAR_LOGIN" \ + -D sonar.projectKey="$$CLIENT_NAME:$$PROJECT_NAME" \ + -D sonar.projectName="$$PROJECT_NAME" \ + -D sonar.projectVersion=1.0."$$BUILD_NUMBER" \ + -D sonar.branch.name="$$BRANCH_NAME" \ + -D sonar.sources=. + +ecr-login: + eval $$(aws ecr get-login | sed 's/-e none//') + +ecr-repository: + if ! aws ecr describe-repositories --repository-names "$$DOCKER_NAME"; then \ + aws ecr create-repository --repository-name "$$DOCKER_NAME"; \ + fi + clean: go clean -i -r ngrok/... rm -rf src/ngrok/client/assets/ src/ngrok/server/assets/ diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100755 index 00000000..f8424556 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -eu + +DOMAIN=${DOMAIN:-} +TLS_CERT=${TLS_CERT:-} +TLS_KEY=${TLS_KEY:-} +LOG_LEVEL=${LOG_LEVEL:-debug} + +exec /usr/local/bin/ngrokd -log stdout -log-level "$LOG_LEVEL" -d "$DOMAIN" -tlsCrt "$TLS_CERT" -tlsKey "$TLS_KEY" From 028e4f1b26f89515b358e0260dfa73e00d865313 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Thu, 2 Aug 2018 17:02:37 -0400 Subject: [PATCH 2/9] missing steps block --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bc16b414..429933bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,9 @@ pipeline { } stages { stage('Root CA') { + steps { sh 'make letsencrypt-root' + } } stage('Build Linux') { environment { From e419305d08ca29dd881dacb979d7eaefa899ec69 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Thu, 2 Aug 2018 17:08:27 -0400 Subject: [PATCH 3/9] fix case --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 429933bb..a691db97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,8 +38,8 @@ pipeline { milestone(ordinal: 30, label: 'build darwin milestone') sh 'make release-server' sh 'make release-client' - archiveartifacts artifacts: 'bin/darwin_amd64/ngrokd', fingerprint: true - archiveartifacts artifacts: 'bin/darwin_amd64/ngrok', fingerprint: true + archiveArtifacts artifacts: 'bin/darwin_amd64/ngrokd', fingerprint: true + archiveArtifacts artifacts: 'bin/darwin_amd64/ngrok', fingerprint: true } } } From b5855f8d502b9ed63c9e2a037aa31f694a847689 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Thu, 2 Aug 2018 17:11:05 -0400 Subject: [PATCH 4/9] fix ordinals --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a691db97..80806e84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ pipeline { steps { lock(resource: "${JOB_NAME}-sonarqube") { echo "obtained lock: ${JOB_NAME}-sonarqube" - milestone(ordinal: 20, label: 'sonarqube milestone') + milestone(ordinal: 50, label: 'sonarqube milestone') sh 'make docker-sonar' } } @@ -66,7 +66,7 @@ pipeline { expression { BRANCH_NAME ==~ /master/ } } steps { - milestone(ordinal: 30, label: 'docker tag milestone') + milestone(ordinal: 60, label: 'docker tag milestone') sh 'make docker-tag' } } @@ -75,7 +75,7 @@ pipeline { expression { BRANCH_NAME ==~ /master/ } } steps { - milestone(ordinal: 40, label: 'docker push milestone') + milestone(ordinal: 70, label: 'docker push milestone') sh ''' eval "$(aws ecr get-login --region "$AWS_ECR_REGION" --registry-ids "$AWS_ECR_REGISTRY_ID" | sed 's/-e none //')" ''' From 8cf269f4f56484a410022f1a9ca1fba66a4a28e8 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Fri, 3 Aug 2018 12:49:08 -0400 Subject: [PATCH 5/9] expose ports --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6eec2752..4b41416f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM intersect/debian:latest - +FROM intersect/debian:latest COPY entrypoint.sh /entrypoint.sh COPY bin/ngrokd /usr/local/bin/ngrokd @@ -14,3 +13,6 @@ LABEL BUILD_NUMBER ${BUILD_NUMBER} ENV GIT_COMMIT ${GIT_COMMIT} ENV BUILD_NUMBER ${BUILD_NUMBER} + +EXPOSE 443 +EXPOSE 4443 From aac52c374eb0fd7825f9b9fc5a0c0d6334ec8a80 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Fri, 3 Aug 2018 12:50:16 -0400 Subject: [PATCH 6/9] clean up --- Dockerfile | 10 +++++----- Makefile | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b41416f..66bc2044 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -FROM intersect/debian:latest -COPY entrypoint.sh /entrypoint.sh +FROM intersect/debian:latest -COPY bin/ngrokd /usr/local/bin/ngrokd +COPY entrypoint.sh /entrypoint.sh +COPY bin/ngrokd /usr/local/bin/ngrokd ENTRYPOINT ["/entrypoint.sh"] ARG GIT_COMMIT ARG BUILD_NUMBER -LABEL GIT_COMMIT ${GIT_COMMIT} +LABEL GIT_COMMIT ${GIT_COMMIT} LABEL BUILD_NUMBER ${BUILD_NUMBER} -ENV GIT_COMMIT ${GIT_COMMIT} +ENV GIT_COMMIT ${GIT_COMMIT} ENV BUILD_NUMBER ${BUILD_NUMBER} EXPOSE 443 diff --git a/Makefile b/Makefile index a1978b88..c8722b07 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -SHELL = /usr/bin/env bash +SHELL = /usr/bin/env bash -eu -DOMAIN = ngrok.bnotions.com -EMAIL = softwareadmin@bnotions.com +DOMAIN = '' +EMAIL = '' CLIENT_NAME = intersect PROJECT_NAME = ngrok DOCKER_NAME = $(CLIENT_NAME)/$(PROJECT_NAME) @@ -128,7 +128,6 @@ docker-image: docker build \ --build-arg BUILD_NUMBER \ --build-arg GIT_COMMIT \ - --build-arg DOMAIN=$(DOMAIN) \ --tag "$$DOCKER_NAME:$$TAG" . docker-tag: @@ -146,13 +145,13 @@ docker-push: @echo Pushed: "$$REPOSITORY/$$DOCKER_NAME:$$TAG" docker-sonar: - docker pull 108026493146.dkr.ecr.us-east-1.amazonaws.com/intersect/sonar-scanner:latest + docker pull "$$REPOSITORY/intersect/sonar-scanner:latest" docker run --rm \ --userns host \ --user $$(id -u $$USER) \ --volume "$$PWD":/usr/src/app \ --workdir /usr/src/app \ - 108026493146.dkr.ecr.us-east-1.amazonaws.com/intersect/sonar-scanner:latest \ + "$$REPOSITORY/intersect/sonar-scanner:latest" \ -D sonar.host.url="$$SONAR_HOST" \ -D sonar.login="$$SONAR_LOGIN" \ -D sonar.projectKey="$$CLIENT_NAME:$$PROJECT_NAME" \ From 54ac09db0cb632132097be3fde9d1699106138b4 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Tue, 28 Aug 2018 13:29:46 -0400 Subject: [PATCH 7/9] letsencrypt root cert --- assets/client/tls/ngrokroot.crt | 53 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/assets/client/tls/ngrokroot.crt b/assets/client/tls/ngrokroot.crt index 20585f1c..108c050e 100644 --- a/assets/client/tls/ngrokroot.crt +++ b/assets/client/tls/ngrokroot.crt @@ -1,25 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs -IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 -MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux -FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h -bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v -dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt -H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 -uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX -mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX -a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN -E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 -WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD -VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 -Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU -cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx -IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN -AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH -YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 -6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC -Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX -c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a -mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +MIIFjTCCA3WgAwIBAgIRANOxciY0IzLc9AUoUSrsnGowDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTYxMDA2MTU0MzU1 +WhcNMjExMDA2MTU0MzU1WjBKMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDEjMCEGA1UEAxMaTGV0J3MgRW5jcnlwdCBBdXRob3JpdHkgWDMwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc0wzwWuUuR7dyXTeDs2hjMOrX +NSYZJeG9vjXxcJIvt7hLQQWrqZ41CFjssSrEaIcLo+N15Obzp2JxunmBYB/XkZqf +89B4Z3HIaQ6Vkc/+5pnpYDxIzH7KTXcSJJ1HG1rrueweNwAcnKx7pwXqzkrrvUHl +Npi5y/1tPJZo3yMqQpAMhnRnyH+lmrhSYRQTP2XpgofL2/oOVvaGifOFP5eGr7Dc +Gu9rDZUWfcQroGWymQQ2dYBrrErzG5BJeC+ilk8qICUpBMZ0wNAxzY8xOJUWuqgz +uEPxsR/DMH+ieTETPS02+OP88jNquTkxxa/EjQ0dZBYzqvqEKbbUC8DYfcOTAgMB +AAGjggFnMIIBYzAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADBU +BgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEBATAwMC4GCCsGAQUFBwIB +FiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQub3JnMB0GA1UdDgQWBBSo +SmpjBH3duubRObemRWXv86jsoTAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js +LnJvb3QteDEubGV0c2VuY3J5cHQub3JnMHIGCCsGAQUFBwEBBGYwZDAwBggrBgEF +BQcwAYYkaHR0cDovL29jc3Aucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcvMDAGCCsG +AQUFBzAChiRodHRwOi8vY2VydC5yb290LXgxLmxldHNlbmNyeXB0Lm9yZy8wHwYD +VR0jBBgwFoAUebRZ5nu25eQBc4AIiMgaWPbpm24wDQYJKoZIhvcNAQELBQADggIB +ABnPdSA0LTqmRf/Q1eaM2jLonG4bQdEnqOJQ8nCqxOeTRrToEKtwT++36gTSlBGx +A/5dut82jJQ2jxN8RI8L9QFXrWi4xXnA2EqA10yjHiR6H9cj6MFiOnb5In1eWsRM +UM2v3e9tNsCAgBukPHAg1lQh07rvFKm/Bz9BCjaxorALINUfZ9DD64j2igLIxle2 +DPxW8dI/F2loHMjXZjqG8RkqZUdoxtID5+90FgsGIfkMpqgRS05f4zPbCEHqCXl1 +eO5HyELTgcVlLXXQDgAWnRzut1hFJeczY1tjQQno6f6s+nMydLN26WuU4s3UYvOu +OsUxRlJu7TSRHqDC3lSE5XggVkzdaPkuKGQbGpny+01/47hfXXNB7HntWNZ6N2Vw +p7G6OfY+YQrZwIaQmhrIqJZuigsrbe3W+gdn5ykE9+Ky0VgVUsfxo52mwFYs1JKY +2PGDuWx8M6DlS6qQkvHaRUo0FMd8TsSlbF0/v965qGFKhSDeQoMpYnwcmQilRh/0 +ayLThlHLN81gSkJjVrPI0Y8xCVPB4twb1PFUd2fPM3sA1tJ83sZ5v8vgFv2yofKR +PB0t6JzUA81mSqM3kxl5e+IZwhYAyO0OTg3/fs8HqGTNKd9BqoUwSRBzp06JMg5b +rUCGwbCUDI0mxadJ3Bz4WxR6fyNpBK2yAinWEsikxqEt -----END CERTIFICATE----- From 41bc0742ecf5172578c319c4748cbf30663bfec3 Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Tue, 28 Aug 2018 13:30:13 -0400 Subject: [PATCH 8/9] fix domain flag --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index f8424556..02b980ca 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,4 +6,4 @@ TLS_CERT=${TLS_CERT:-} TLS_KEY=${TLS_KEY:-} LOG_LEVEL=${LOG_LEVEL:-debug} -exec /usr/local/bin/ngrokd -log stdout -log-level "$LOG_LEVEL" -d "$DOMAIN" -tlsCrt "$TLS_CERT" -tlsKey "$TLS_KEY" +exec /usr/local/bin/ngrokd -log stdout -log-level "$LOG_LEVEL" -domain "$DOMAIN" -tlsCrt "$TLS_CERT" -tlsKey "$TLS_KEY" From 834bf682fd92b617a64c5a54d2d15d2d3cedf2cd Mon Sep 17 00:00:00 2001 From: "Jonathon W. Marshall" Date: Tue, 28 Aug 2018 13:31:04 -0400 Subject: [PATCH 9/9] update ignores --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6bfe2d87..385de4e6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ src/ngrok/server/assets/ /? letsencrypt .cache +.DS_Store +*.zip