Merge pull request #29 from Diesel-Net/development

Promotion
Diesel-Net · Aug 13, 2022 · 761622f · 761622f
2 parents e655854 + 4a7f8e8
commit 761622f
Show file tree

Hide file tree

Showing 17 changed files with 119 additions and 85 deletions.
diff --git a/.ansible/ansible.cfg b/.ansible/ansible.cfg
diff --git a/.ansible/deploy.yaml b/.ansible/deploy.yaml
@@ -1,9 +1,7 @@
-# ansible-playbook deploy.yaml -i inventories/dev/hosts --vault-id ~/.tokens/master_id
-
 - hosts: all
   strategy: free
   roles:
-    - common
+    - traefik
 
   tasks:
 

diff --git a/.ansible/inventory/development/hosts → .ansible/inventories/dev.yaml b/.ansible/inventory/development/hosts → .ansible/inventories/dev.yaml
@@ -1,10 +1,14 @@
 all:
   children:
 
-    manager:
+    swarm_manager:
       hosts:
         dev.diesel.net: 
 
-  vars:        
+  vars:
+    proxy_domains: 
+      - dev.diesel.net
+      - dev.kiwi-labs.net
+
     ansible_user: automation
     ansible_python_interpreter: /usr/bin/python3
diff --git a/.ansible/inventories/prod.yaml b/.ansible/inventories/prod.yaml
@@ -0,0 +1,14 @@
+all:
+  children:
+
+    swarm_manager:
+      hosts:
+        prod.diesel.net: 
+
+  vars:
+    proxy_domains: 
+      - prod.diesel.net
+      - kiwi-labs.net
+
+    ansible_user: automation
+    ansible_python_interpreter: /usr/bin/python3
diff --git a/.ansible/inventory/stable/hosts → .ansible/inventories/test.yaml b/.ansible/inventory/stable/hosts → .ansible/inventories/test.yaml
@@ -1,10 +1,14 @@
 all:
   children:
 
-    manager:
+    swarm_manager:
       hosts:
         test.diesel.net: 
 
-  vars:        
+  vars:
+    proxy_domains: 
+      - test.diesel.net
+      - test.kiwi-labs.net
+
     ansible_user: automation
     ansible_python_interpreter: /usr/bin/python3
diff --git a/.ansible/inventory/development/group_vars/all/main.yaml b/.ansible/inventory/development/group_vars/all/main.yaml
diff --git a/.ansible/inventory/development/group_vars/manager/main.yaml b/.ansible/inventory/development/group_vars/manager/main.yaml
diff --git a/.ansible/inventory/production/group_vars/all/main.yaml b/.ansible/inventory/production/group_vars/all/main.yaml
diff --git a/.ansible/inventory/production/group_vars/manager/main.yaml b/.ansible/inventory/production/group_vars/manager/main.yaml
diff --git a/.ansible/inventory/production/hosts b/.ansible/inventory/production/hosts
diff --git a/.ansible/inventory/stable/group_vars/all/main.yaml b/.ansible/inventory/stable/group_vars/all/main.yaml
diff --git a/.ansible/inventory/stable/group_vars/manager/main.yaml b/.ansible/inventory/stable/group_vars/manager/main.yaml
diff --git a/.ansible/roles/requirements.yaml b/.ansible/roles/requirements.yaml
@@ -1,9 +1,9 @@
-- name: common
-  scm: git
-  src: "git@github.com:Diesel-Net/ansible-role-common.git"
-  version: 1.1.3
-
 - name: docker
   scm: git
   src: "git@github.com:Diesel-Net/ansible-role-docker.git"
-  version: 1.3.0
+  version: 2.0.0
+
+- name: traefik
+  scm: git
+  src: "git@github.com:Diesel-Net/ansible-role-traefik.git"
+  version: 2.0.0
diff --git a/.ansible/templates/docker-compose.yaml.j2 → .ansible/templates/docker-compose.yaml b/.ansible/templates/docker-compose.yaml.j2 → .ansible/templates/docker-compose.yaml
@@ -4,7 +4,7 @@ version: '3.8'
 services: 
 
   main:
-    image: {{ docker_registry }}/{{ repository }}:{{ version }}-latest
+    image: {{ docker_image }}
 
     environment:
       - TITLE=Kiwi Labs
@@ -21,9 +21,9 @@ services:
         - traefik.http.routers.coming-soon.tls.domains[0].sans={{ proxy_domains[0] }}
         - traefik.http.routers.coming-soon.priority=1
     networks:
-      - {{ docker_network }}
+      - {{ traefik_network }}
 
 networks:
-  {{ docker_network }}:
+  {{ traefik_network }}:
     external:
-      name: {{ docker_network }}
+      name: {{ traefik_network }}
diff --git a/.drone.yaml b/.drone.yaml
@@ -1,13 +1,16 @@
 ---
 kind: pipeline
 type: docker
-name: Deploy coming-soon page
+name: Deploy coming-soon page (dev)
 
 clone:
   depth: 1
 
+concurrency:
+  limit: 1
+
 steps:
-  - name: docker build & push (dev/test)
+  - name: docker build & push
     image: plugins/docker
     settings:
       mirror: dockerhub.nexus.diesel.net
@@ -19,14 +22,37 @@ steps:
       repo: docker.nexus.diesel.net/${DRONE_REPO_NAME}
       tags:
         - ${DRONE_BRANCH}-latest
-    when:
-      branch:
-        - development
-        - stable
-      event:
-        - push
-
-  - name: docker build & push (prod)
+
+  - name: deploy
+    image: docker.nexus.diesel.net/drone-ansible:2.13
+    settings:
+      galaxy: .ansible/roles/requirements.yaml
+      inventory: .ansible/inventories/dev.yaml
+      playbook: .ansible/deploy.yaml
+      private_key:
+        from_secret: automation_id_rsa
+      vault_password:
+        from_secret: ansible_vault_password
+
+trigger:
+  branch:
+    - development
+  event:
+    - push
+
+---
+kind: pipeline
+type: docker
+name: Deploy coming-soon page (test)
+
+clone:
+  depth: 1
+
+concurrency:
+  limit: 1
+
+steps:
+  - name: docker build & push
     image: plugins/docker
     settings:
       mirror: dockerhub.nexus.diesel.net
@@ -37,35 +63,63 @@ steps:
         from_secret: nexus_pass
       repo: docker.nexus.diesel.net/${DRONE_REPO_NAME}
       tags:
-        - production-latest
-        - ${DRONE_TAG}
-    when:
-      event:
-        - tag
+        - ${DRONE_BRANCH}-latest
 
   - name: deploy
-    image: plugins/ansible:3
-    environment:
-      ANSIBLE_CONFIG: .ansible/ansible.cfg
+    image: docker.nexus.diesel.net/drone-ansible:2.13
     settings:
-      playbook: .ansible/deploy.yaml
       galaxy: .ansible/roles/requirements.yaml
+      inventory: .ansible/inventories/test.yaml
+      playbook: .ansible/deploy.yaml
       private_key:
         from_secret: automation_id_rsa
       vault_password:
         from_secret: ansible_vault_password
-    commands:
-      # dynamically select inventory based on Git branch/tag
-      - version=$DRONE_BRANCH
-      - if [ ! -z $DRONE_TAG ]; then version=production; fi
-      - /bin/drone-ansible --inventory .ansible/inventory/$$version/hosts
-
 
 trigger:
   branch:
-    - development
     - stable
   event:
     - push
+
+---
+kind: pipeline
+type: docker
+name: Deploy coming-soon page (prod)
+
+clone:
+  depth: 1
+
+concurrency:
+  limit: 1
+
+steps:
+  - name: docker build & push
+    image: plugins/docker
+    settings:
+      mirror: dockerhub.nexus.diesel.net
+      registry: docker.nexus.diesel.net
+      username:
+        from_secret: nexus_user
+      password:
+        from_secret: nexus_pass
+      repo: docker.nexus.diesel.net/${DRONE_REPO_NAME}
+      tags:
+        - production-latest
+        - ${DRONE_TAG}
+
+  - name: deploy
+    image: docker.nexus.diesel.net/drone-ansible:2.13
+    settings:
+      galaxy: .ansible/roles/requirements.yaml
+      inventory: .ansible/inventories/prod.yaml
+      playbook: .ansible/deploy.yaml
+      private_key:
+        from_secret: automation_id_rsa
+      vault_password:
+        from_secret: ansible_vault_password
+
+trigger:
+  event:
     - tag
 ...
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .ansible/roles/docker
 .ansible/roles/common
+.ansible/roles/application
+.ansible/roles/traefik
 .DS_Store
diff --git a/README.md b/README.md
@@ -3,17 +3,6 @@
 # coming-soon 
 Thanks to [Creative Tim](http://www.creative-tim.com) for supplying a great [template](https://www.creative-tim.com/product/coming-sssoon-page) to work from.
 
-## Installing External Dependencies
-Ansible `2.10.3` was used at the time of this writing.
-```bash
-ansible-galaxy install -r .ansible/roles/requirements.yaml -p .ansible/roles --force
-```
-
-## Deploy
-```bash
-ansible-playbook .ansible/deploy.yaml -i .ansible/inventories/development/hosts --vault-id ~/.tokens/vault.txt
-```
-
 ## Environment Variables
 
 You have the following environment variables which allow you to configure the