Merge pull request #1 from XenitAB/feature/docker-pull

Feature/docker pull
XenitAB · Dec 4, 2020 · dd64d4f · dd64d4f
2 parents 567d3a4 + 886bd17
commit dd64d4f
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 2 deletions.
diff --git a/...ure/azure-pipelines-agent/ubuntu1804.json → ...ipelines-agent/azure-pipelines-agent.json b/...ure/azure-pipelines-agent/ubuntu1804.json → ...ipelines-agent/azure-pipelines-agent.json
@@ -33,7 +33,7 @@
     {
       "type": "ansible",
       "use_proxy": false,
-      "playbook_file": "{{template_dir}}/ubuntu1804-ansible.yaml"
+      "playbook_file": "{{template_dir}}/files/azure-pipelines-agent.yaml"
     },
     {
       "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} sudo -E sh '{{ .Path }}'",

diff --git a/...e-pipelines-agent/ubuntu1804-ansible.yaml → ...es-agent/files/azure-pipelines-agent.yaml b/...e-pipelines-agent/ubuntu1804-ansible.yaml → ...es-agent/files/azure-pipelines-agent.yaml
@@ -102,6 +102,33 @@
         state: present
         update_cache: yes
 
+    - name: Create the directory /etc/xenit
+      file:
+        path: /etc/xenit
+        state: directory
+        mode: "0755"
+
+    - name: Copy docker-pull.sh
+      copy:
+        src: docker-pull.sh
+        dest: /etc/xenit/docker-pull.sh
+        owner: root
+        group: root
+        mode: "0744"
+
+    - name: Copy docker-pull.service
+      copy:
+        src: docker-pull.service
+        dest: /etc/systemd/system/docker-pull.service
+        owner: root
+        group: root
+        mode: "0644"
+
+    - name: Enable docker-pull.service
+      systemd:
+        name: docker-pull.service
+        enabled: yes
+
     - name: apt upgrade
       apt:
         upgrade: yes

diff --git a/templates/azure/azure-pipelines-agent/files/docker-pull.service b/templates/azure/azure-pipelines-agent/files/docker-pull.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=docker-pull
+After=network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory=/etc/xenit
+ExecStart=/etc/xenit/docker-pull.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/templates/azure/azure-pipelines-agent/files/docker-pull.sh b/templates/azure/azure-pipelines-agent/files/docker-pull.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+docker pull ghcr.io/xenitab/github-actions/tools:latest
diff --git a/templates/azure/github-runner/files/docker-pull.service b/templates/azure/github-runner/files/docker-pull.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=docker-pull
+After=network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory=/etc/xenit
+ExecStart=/etc/xenit/docker-pull.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/templates/azure/github-runner/files/docker-pull.sh b/templates/azure/github-runner/files/docker-pull.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+docker pull ghcr.io/xenitab/github-actions/tools:latest
diff --git a/templates/azure/github-runner/files/github-runner.yaml b/templates/azure/github-runner/files/github-runner.yaml
@@ -165,6 +165,33 @@
         src: /etc/github-runner/actions-runner.tar.gz
         dest: /etc/github-runner
 
+    - name: Create the directory /etc/xenit
+      file:
+        path: /etc/xenit
+        state: directory
+        mode: "0755"
+
+    - name: Copy docker-pull.sh
+      copy:
+        src: docker-pull.sh
+        dest: /etc/xenit/docker-pull.sh
+        owner: root
+        group: root
+        mode: "0744"
+
+    - name: Copy docker-pull.service
+      copy:
+        src: docker-pull.service
+        dest: /etc/systemd/system/docker-pull.service
+        owner: root
+        group: root
+        mode: "0644"
+
+    - name: Enable docker-pull.service
+      systemd:
+        name: docker-pull.service
+        enabled: yes
+
     - name: apt upgrade
       apt:
         upgrade: yes

diff --git a/templates/azure/github-runner/github-runner.json b/templates/azure/github-runner/github-runner.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "AZURE_RESOURCE_GROUP_NAME": "rg-dev-we-hub"
+    "AZURE_RESOURCE_GROUP_NAME": "{{env `AZURE_RESOURCE_GROUP_NAME`}}"
   },
   "builders": [
     {