From 51467b2e722b604b4f9bb4d135ef3953bfa69eb2 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:20:30 -0400 Subject: [PATCH 01/10] Adds cloudbuild.yaml --- .dockerignore | 4 ++-- .gitignore | 1 - .npmignore | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 28bb04d..2ea33b4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,8 @@ .git node_modules Dockerfile -yarn.lock npm-debug.log docker-compose.yml .env -README.md \ No newline at end of file +README.md +Jenkinsfile \ No newline at end of file diff --git a/.gitignore b/.gitignore index 869efb8..8e480e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ node_modules -yarn.lock npm-debug.log .env \ No newline at end of file diff --git a/.npmignore b/.npmignore index 869efb8..90e2a80 100644 --- a/.npmignore +++ b/.npmignore @@ -1,4 +1,4 @@ node_modules -yarn.lock npm-debug.log -.env \ No newline at end of file +.env +Jenkinsfile \ No newline at end of file From eff827600aede5952342b65e0a2dcaaeceb35997 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:20:38 -0400 Subject: [PATCH 02/10] Adds cloudbuild.yaml --- cloudbuild.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 cloudbuild.yaml diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 0000000..5389648 --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,7 @@ +steps: +- name: 'gcr.io/cloud-builders/docker' + args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] +- name: 'gcr.io/cloud-builders/docker' + args: [ 'run', '--rm', '--entrypoint=""', 'gcr.io/znetstar-net/tor-router', 'npm', 'test' ] +- name: 'gcr.io/cloud-builders/docker' + args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] \ No newline at end of file From 1fa52e50e8c439cf71fc4144e00325f7aadadb00 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:31:33 -0400 Subject: [PATCH 03/10] modify cloudbuild.yaml --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 5389648..5e1a504 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,7 +1,7 @@ steps: - name: 'gcr.io/cloud-builders/docker' args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] -- name: 'gcr.io/cloud-builders/docker' - args: [ 'run', '--rm', '--entrypoint=""', 'gcr.io/znetstar-net/tor-router', 'npm', 'test' ] +- name: 'gcr.io/znetstar-net/tor-router' + args: [ 'npm', 'test' ] - name: 'gcr.io/cloud-builders/docker' args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] \ No newline at end of file From b0705d129d7b439c51a43bc05acc8e50fde5e452 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:36:58 -0400 Subject: [PATCH 04/10] modify cloudbuild.yaml --- cloudbuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 5e1a504..27f286a 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,6 +2,7 @@ steps: - name: 'gcr.io/cloud-builders/docker' args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] - name: 'gcr.io/znetstar-net/tor-router' + entrypoint: "" args: [ 'npm', 'test' ] - name: 'gcr.io/cloud-builders/docker' args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] \ No newline at end of file From e0e5d50c35c1f9e96683806b533ced723aaf65f9 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:40:21 -0400 Subject: [PATCH 05/10] modify cloudbuild.yaml --- cloudbuild.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 27f286a..935df12 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,7 +2,8 @@ steps: - name: 'gcr.io/cloud-builders/docker' args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] - name: 'gcr.io/znetstar-net/tor-router' - entrypoint: "" - args: [ 'npm', 'test' ] + entrypoint: 'npm' + args: [ 'test' ] - name: 'gcr.io/cloud-builders/docker' - args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] \ No newline at end of file + args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] +images: ['gcr.io/znetstar-net/tor-router'] \ No newline at end of file From ac421e3897539ad03e3bbf5b174ef648609a8752 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:42:36 -0400 Subject: [PATCH 06/10] Remove external tor repo from dockerfile --- Dockerfile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc58783..2709e20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,20 +14,7 @@ ENV TOR_PATH /usr/bin/tor ENV PATH $PATH:/app/bin -ADD https://deb.nodesource.com/setup_8.x /tmp/nodejs_install - -RUN apt-get update && apt-get -y install dirmngr - -RUN gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 && gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - - -RUN echo 'deb http://deb.torproject.org/torproject.org artful main\n\ -\n\ -deb-src http://deb.torproject.org/torproject.org artful main'\ ->> /etc/apt/sources.list.d/tor.list - -RUN bash /tmp/nodejs_install - -RUN apt-get install -y nodejs tor git +RUN apt-get update && apt-get install -y nodejs tor git RUN useradd -ms /bin/bash tor_router From 129136aa691d66bb6ab7ff879199a663de5b28fd Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:46:06 -0400 Subject: [PATCH 07/10] switches to node:8 repo --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2709e20..6992e96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM node:8-jessie WORKDIR /app @@ -14,7 +14,7 @@ ENV TOR_PATH /usr/bin/tor ENV PATH $PATH:/app/bin -RUN apt-get update && apt-get install -y nodejs tor git +RUN apt-get update && apt-get install -y tor RUN useradd -ms /bin/bash tor_router From 784ab58e84ff5466f6f5f6680fc15ca3cc00cda6 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:51:45 -0400 Subject: [PATCH 08/10] modify cloudbuild --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 935df12..756dea7 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,8 +2,8 @@ steps: - name: 'gcr.io/cloud-builders/docker' args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] - name: 'gcr.io/znetstar-net/tor-router' - entrypoint: 'npm' - args: [ 'test' ] + entrypoint: '/bin/bash' + args: [ '-c', '"cd /app && npm test"' ] - name: 'gcr.io/cloud-builders/docker' args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] images: ['gcr.io/znetstar-net/tor-router'] \ No newline at end of file From 422790bee10d43232290d1a4b434b5b5d6d6d84d Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:54:48 -0400 Subject: [PATCH 09/10] modify cloudbuild --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 756dea7..efef7e4 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -2,8 +2,8 @@ steps: - name: 'gcr.io/cloud-builders/docker' args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] - name: 'gcr.io/znetstar-net/tor-router' - entrypoint: '/bin/bash' - args: [ '-c', '"cd /app && npm test"' ] + entrypoint: '/app/node_modules/.bin/mocha' + args: [ '/app/test/test.js' ] - name: 'gcr.io/cloud-builders/docker' args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] images: ['gcr.io/znetstar-net/tor-router'] \ No newline at end of file From 150e1e8af6d8c46e1446e7fa7a51835ef51be499 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 12 Aug 2018 11:55:42 -0400 Subject: [PATCH 10/10] modify cloudbuild --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index efef7e4..650b72a 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -3,7 +3,7 @@ steps: args: [ 'build', '-t', 'gcr.io/znetstar-net/tor-router', '.' ] - name: 'gcr.io/znetstar-net/tor-router' entrypoint: '/app/node_modules/.bin/mocha' - args: [ '/app/test/test.js' ] + args: [ '--exit', '/app/test/test.js' ] - name: 'gcr.io/cloud-builders/docker' args: [ 'push', 'gcr.io/znetstar-net/tor-router' ] images: ['gcr.io/znetstar-net/tor-router'] \ No newline at end of file