From f77a1d75c7ca95f99c2ea2518c0f1521d50a5c99 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Thu, 25 Jan 2018 20:59:53 +0000 Subject: [PATCH] remove old package file, update drone config --- .drone.yml | 20 ++++++++++++-------- package.json | 10 ---------- 2 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 package.json diff --git a/.drone.yml b/.drone.yml index 1e8fe0a..98e4f55 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,23 +22,27 @@ pipeline: publish-test: pull: True image: appleboy/drone-ssh - host: maidstone-hackspace.org.uk - user: ${SSH_USER} - key: ${SSH_KEY} + host: stage.maidstone-hackspace.org.uk + user: root + secrets: + - source: DEPLOY_SSH_KEY + target: ssh_key port: 22 command_timeout: 480 script: - - cd /var/www/stage/maidstone-hackspace-website + - cd /var/www/maidstone-hackspace-website - git pull - - docker-compose -fstage.yml down --remove-orphans - docker-compose -fstage.yml build + - docker-compose -fstage.yml down --remove-orphans - docker-compose -fstage.yml up -d publish-live: -# pull: True + pull: True image: appleboy/drone-ssh - user: {SSH_USER} - key: {SSH_KEY} + user: root + secrets: + - source: DEPLOY_SSH_KEY + target: ssh_key host: maidstone-hackspace.org.uk port: 22 command_timeout: 480 diff --git a/package.json b/package.json deleted file mode 100644 index d650ff4..0000000 --- a/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "mhackspace", - "version": "0.1.0", - "dependencies": { - "bootstrap": "^4.0.0", - "jquery": "^1.9.1", - "package.json": "^2.0.1", - "popper.js": "^1.12.9" - } -}