Merge pull request #102 from NYULibraries/chore/jenkins_deploy

ericgriffis · web-flow · commit 35717b8fb037 · 2021-04-30T10:35:47.000-04:00
Chore/jenkins deploy
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,8 @@ jobs:
       - run:
           name: Deploy into staging via Jenkins
           command: |
-            docker run --rm appropriate/curl -u $JENKINS_USERNAME:$JENKINS_API_KEY -X POST http://jenkins.library.nyu.edu/view/Privileges%20Guide/job/Privileges%20Guide%20Development%20Deploy/build/api
+            #docker run --rm appropriate/curl -u $JENKINS_USERNAME:$JENKINS_API_KEY -X POST http://jenkins.library.nyu.edu/view/Privileges%20Guide/job/Privileges%20Guide%20Development%20Deploy/build/api
+            docker run --rm -e JOB_NAME=Privileges%20Deploy -e DEPLOY_ENV=staging -e TIMEOUT=10m -e JENKINS_CI_HOST=jenkinsci.library.nyu.edu -e JENKINS_CI_USERNAME -e JENKINS_CI_API_KEY -e CIRCLE_SHA1 quay.io/nyulibraries/jenkins_build
 
   deploy-prod:
     <<: *docker-defaults
@@ -48,7 +49,8 @@ jobs:
       - run:
           name: Deploy into production via Jenkins
           command: |
-            docker run --rm appropriate/curl -u $JENKINS_USERNAME:$JENKINS_API_KEY -X POST http://jenkins.library.nyu.edu/view/Privileges%20Guide/job/Privileges%20Guide%20Production%20Deploy/build/api
+            #docker run --rm appropriate/curl -u $JENKINS_USERNAME:$JENKINS_API_KEY -X POST http://jenkins.library.nyu.edu/view/Privileges%20Guide/job/Privileges%20Guide%20Production%20Deploy/build/api
+            docker run --rm -e JOB_NAME=Privileges%20Deploy -e DEPLOY_ENV=production -e TIMEOUT=10m -e JENKINS_CI_HOST=jenkinsci.library.nyu.edu -e JENKINS_CI_USERNAME -e JENKINS_CI_API_KEY -e CIRCLE_SHA1 quay.io/nyulibraries/jenkins_build
 
 workflows:
   version: 2
diff --git a/Dockerfile.test b/Dockerfile.test
@@ -13,9 +13,8 @@ COPY --chown=docker:docker script/docker/wait-for.sh ./
 
 COPY --chown=docker:docker bin/ bin/
 COPY --chown=docker:docker Gemfile Gemfile.lock ./
-#ARG RUN_PACKAGES="nodejs ruby-mysql2 default-libmysqlclient-dev"
-ARG RUN_PACKAGES="nodejs ruby-mysql2 default-libmysqlclient-dev"
-ARG BUILD_PACKAGES="build-essential zlib1g-dev git"
+ARG RUN_PACKAGES="nodejs ruby-mysql2 default-libmysqlclient-dev ssh git"
+ARG BUILD_PACKAGES="build-essential zlib1g-dev"
 RUN apt-get update && apt-get -y --no-install-recommends install $BUILD_PACKAGES $RUN_PACKAGES \
   && gem install bundler -v '1.16.6' \
   && bundle config --local github.https true \
@@ -28,6 +27,9 @@ RUN apt-get update && apt-get -y --no-install-recommends install $BUILD_PACKAGES
 
 USER docker
 
+# avoid ssh key verification failures on runtime
+RUN mkdir ~/.ssh && touch ~/.ssh/known_hosts && ssh-keyscan github.com >> ~/.ssh/known_hosts
+
 COPY --chown=docker:docker . .
 RUN bin/rails assets:precompile
 
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -14,3 +14,6 @@
 set :app_title, "privileges"
 set :rvm_ruby_string, "ruby-2.6.2"
 set :assets_gem, ["nyulibraries_stylesheets.git", "nyulibraries_javascripts.git"]
+
+set :scm, :git
+set(:branch, (ENV["GIT_COMMIT"] || ENV["GIT_BRANCH"]).gsub(/remotes\//,"").gsub(/origin\//,""))
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
@@ -1,2 +1 @@
 set :rails_env, "production"
-set :branch, "master"
diff --git a/config/deploy/qa.rb b/config/deploy/qa.rb
@@ -1,4 +1,3 @@
 set :rails_env, "qa"
-set(:branch, ENV["GIT_BRANCH"].gsub(/remotes\//,"").gsub(/origin\//,""))
 set :app_title, "privileges_qa"
 set :repository, "git@github.com:NYULibraries/privileges.git"
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
@@ -1,2 +1 @@
 set :rails_env, "staging"
-set(:branch, ENV["GIT_BRANCH"].gsub(/remotes\//,"").gsub(/origin\//,""))
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -124,3 +124,16 @@ services:
     depends_on:
       - setup_dbs
       - memcached
+
+  deploy:
+    <<: *build_test
+    tty: true
+    stdin_open: true
+    command: "mkdir -p ~/.ssh && touch ~/.ssh/known_hosts && ssh-keyscan github.com >> ~/.ssh/known_hosts && \
+              bundle exec cap $DEPLOY_ENV deploy:setup && bundle exec cap $DEPLOY_ENV deploy"
+    user: root
+    environment:
+      SSH_AUTH_SOCK: '/ssh-agent'
+      GIT_COMMIT: "$GIT_COMMIT"
+    volumes:
+      - "${HOST_SSH_AUTH_SOCK}:/ssh-agent"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`set :rails_env, "production"`
`2`		`-set :branch, "master"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`set :rails_env, "staging"`
`2`		`-set(:branch, ENV["GIT_BRANCH"].gsub(/remotes\//,"").gsub(/origin\//,""))`