compose-hook 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9a8865abb92f4d9916b9f007a066da7061623976bd520d0ee5dad4cf0e4564d
-  data.tar.gz: ea8dd4da5e6cd2dd4430d9d95cce2e3e3693f6cebf7542f4330b2c176f951254
+  metadata.gz: c3491bcf7a0049e4ff7bfa1ba0db224ed10f40050c3bede86d09b770fad954da
+  data.tar.gz: fc05d1cc28ac4cacb2d1df76587fc915fa4074bc2798153f81628fc9e8e78d53
 SHA512:
-  metadata.gz: ab7ab971dd554908b7f268201ecd6f5da5332b7750db790188001a211c1cb152136ee3dcda0e0440c276034f7b9027265564d98eb36ada6cbc1c3764f7e3419f
-  data.tar.gz: e7cd153333d508b66136c099a3ff3c9e90f970e3f117dff97cf17e8e9da5e77be24f786cd35d9975da377f1448f49ab5506bce584c1dacc7591a2cc99cf38292
+  metadata.gz: 0bd14948077b984c891ffe561a640902b0d05cebc671edeb841cd5d78b02043deeeb03da02fd019c3dfae6357784c44780f0701e26d55d92e90896d7fc8e8fcd
+  data.tar.gz: f81395406a042fbe05dd04d8c80a8a5b98d2ab7cbff321bece6968d2a4820f37494ebea4c2fabb70da287c3e80ccb924359f7e6f5c4722ced8bbe4060b1330ff

data/.drone.yml

@@ -26,6 +26,15 @@ steps:
       branch:
         - master
 
+trigger:
+  event:
+    - push
+
+---
+kind: pipeline
+name: tag
+
+steps:
   - name: Publish to RubyGems
     image: ruby:2.6
     environment:
@@ -39,8 +48,8 @@ steps:
       - gem update bundler
       - bundle --jobs $(nproc)
       - bundle exec gem build compose-hook.gemspec
-      - bundle exec gem push compose-hook-0.1.0.gem
+      - bundle exec gem push compose-hook-$DRONE_TAG.gem
 
 trigger:
   event:
-    - push
+    - tag

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compose-hook (0.1.0)
+    compose-hook (0.1.1)
       faraday
       jwt (~> 2.2)
       puma

data/README.md

@@ -1,23 +1,40 @@
 # Compose-hook
 
+
 Simple application to update a service managed by compose using a webhook.
 The trigger is secured with a shared secret.
 
-## Usage
+
+
+### Installation
 
 Install the gem:
 ```
-gem install compose-hook
+  gem install compose-hook
 ```
 
 Install the systemd service on the target machine:
 ```
-bin/install_webhook
+  bin/install_webhook
 ```
 
+Create a config file of the following format:
+```yaml
+- domain:  "www.example.com" # target domain
+  root:    "/home/deploy/example" # the root location of docker-compose
+  subpath: "compose" # [optional] directory containing target Compose files
+- domain:  "its.awesome.com"
+  root:    "/home/deploy/awesome"
+  subpath: ""
+```
+
+Export the config file path as `CONFIG_PATH` before launching the server.
+
+### Usage
+
 Test your installation with a payload
 ```
-compose-payload *service* *docker image* *url*
+  compose-payload *service* *docker image* *url*
 ```
 
 Made with :heart: at [openware](https://www.openware.com/)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/install_webhook

@@ -1,11 +1,19 @@
-#!/bin/bash
-SECRET=$(ruby -rsecurerandom -e 'puts SecureRandom.hex(20)')
+#!/usr/bin/env ruby
 
-sed s/GENERATED_HMAC_SECRET/${SECRET}/g templates/webhook.service > webhook.service
-sed -i s#TARGET_DIRECTORY#${PWD}#g webhook.service
+# frozen_string_literal: true
 
-echo "Generated Secret: ${SECRET}"
+require 'erb'
+require 'fileutils'
 
-sudo mv ./webhook.service /etc/systemd/system/webhook.service
-sudo systemctl daemon-reload
-sudo systemctl start webhook
+TEMPLATE_PATH = "templates/webhook.service.erb"
+OUTPUT_PATH = "/etc/systemd/system/webhook.service"
+
+@secret = SecureRandom.hex(20)
+@config_path = ENV.fetch("STAGES_PATH", File.join(Dir.pwd, "config/deployments.yml"))
+template = ERB.new(File.read(TEMPLATE_PATH))
+File.write(OUTPUT_PATH, template.result(binding))
+
+puts "Generated Secret: #{secret}"
+
+system("sudo systemctl daemon-reload")
+system("sudo systemctl start webhook")

data/config/deployments.yml

@@ -0,0 +1,3 @@
+- domain:  "www.example.com"
+  root:    "/home/deploy/example"
+  subpath: "compose"

data/lib/compose-hook.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "English"
 require "json"
 require "yaml"
 require "sinatra/base"

data/lib/compose_hook/webhook.rb

@@ -4,6 +4,8 @@ class ComposeHook::WebHook < Sinatra::Base
   class RequestError < StandardError; end
   class ServerError < StandardError; end
 
+  attr_accessor :config, :secret, :decoder
+
   CONFIG_PATH = "compose/docker-compose.yml"
   STAGES_PATH = "/home/deploy/webhook/stages.yml"
 
@@ -11,18 +13,35 @@ class ComposeHook::WebHook < Sinatra::Base
 
   def initialize
     super
-    secret = ENV["WEBHOOK_JWT_SECRET"]
-    raise "WEBHOOK_JWT_SECRET is not set" if secret.to_s.empty?
+
+    @secret = ENV["WEBHOOK_JWT_SECRET"]
+    raise "WEBHOOK_JWT_SECRET is not set" if @secret.to_s.empty?
+
+    @config = YAML.load_file(ENV["CONFIG_PATH"])
+    raise "The config file is empty or non-existent" if @config.empty?
 
     @decoder = ComposeHook::Payload.new(secret: secret)
   end
 
-  def update_config(service, image)
-    config = YAML.load_file(CONFIG_PATH)
-    raise RequestError.new("Unknown service") if config["services"][service].nil?
+  def update_service(path, service, image)
+    file = YAML.load_file(path)
+
+    file["services"][service]["image"] = image
+    File.write(path, file.to_yaml)
+  end
+
+  def find_service(service, path)
+    res = ""
 
-    config["services"][service]["image"] = image
-    File.open(CONFIG_PATH, "w") {|f| f.write config.to_yaml }
+    Dir[File.join(path, "*.yml")].each do |file|
+      begin
+        res = file.path unless YAML.load_file(file)["services"][service].empty?
+      rescue StandardError => e
+        puts "Error while parsing deployment files:", e
+      end
+    end
+
+    res
   end
 
   before do
@@ -38,16 +57,16 @@ class ComposeHook::WebHook < Sinatra::Base
       decoded = @decoder.safe_decode(token)
       return answer(400, "invalid token") unless decoded
 
-      stages = YAML.load_file(STAGES_PATH)
-
       service = decoded["service"]
       image = decoded["image"]
       hostname = request.host
-      stage_path = stages.find {|s| s["domain"] == hostname }["path"]
+      deployment = config.find { |d| d["domain"] == hostname }
+      service_file = find_service(service, File.join(deployment["path"], deployment["subpath"]))
 
       return answer(400, "service is not specified") unless service
       return answer(400, "image is not specified") unless image
-      return answer(404, "invalid domain") unless stage_path
+      return answer(404, "invalid domain") unless deployment
+      return answer(404, "invalid service") unless service_file
       return answer(400, "invalid image") if (%r(^(([-_\w\.]){,20}(\/|:))+([-\w\.]{,20})$) =~ image).nil?
 
       system "docker image pull #{image}"
@@ -57,10 +76,10 @@ class ComposeHook::WebHook < Sinatra::Base
         return answer(404, "invalid image") unless $CHILD_STATUS.success?
       end
 
-      Dir.chdir(stage_path) do
-        update_config(service, image)
+      Dir.chdir(deployment["root"]) do
+        update_service(service_file, service, image)
         system "docker-compose up -Vd #{service}"
-        raise ServerError.new("could not restart container") unless $CHILD_STATUS.success?
+        raise ServerError.new("could not recreate the container") unless $CHILD_STATUS.success?
       end
 
       return answer(200, "service #{service} updated with image #{image}")

data/templates/{webhook.service → webhook.service.erb}

@@ -3,11 +3,11 @@ Description=Compose Webhook service
 
 [Service]
 User=deploy
-Environment="WEBHOOK_JWT_SECRET=GENERATED_HMAC_SECRET"
+Environment="WEBHOOK_JWT_SECRET=<%= @secret %>"
+Environment="CONFIG_PATH=<%= @config_path %>"
 ExecStart=/bin/bash -c "source ~/.rvm/scripts/rvm; compose-hook"
 Type=simple
 Restart=always
-WorkingDirectory=TARGET_DIRECTORY
 
 [Install]
 WantedBy=multi-user.target

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compose-hook
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Danylo P.
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -246,11 +246,11 @@ files:
 - bin/install_webhook
 - compose-hook.gemspec
 - config.ru
+- config/deployments.yml
 - lib/compose-hook.rb
 - lib/compose_hook/payload.rb
 - lib/compose_hook/webhook.rb
-- stages.yml
-- templates/webhook.service
+- templates/webhook.service.erb
 homepage: https://www.openware.com
 licenses: []
 metadata: {}

data/stages.yml

@@ -1,2 +0,0 @@
-- domain: "www.example.com"
-  path: "/home/deploy/example"