Merge pull request #186 from dev-sec/1804

add ubuntu 18.04 support
dev-sec · Oct 15, 2018 · 6e32094 · 6e32094
2 parents 1c347af + 8c415e3
commit 6e32094
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -62,6 +62,13 @@ platforms:
     run_command: /sbin/init
     provision_command:
       - systemctl enable ssh.service
+- name: ubuntu1804-ansible-latest
+  driver:
+    image: rndmh3ro/docker-ubuntu1804-ansible:latest
+    platform: ubuntu
+    run_command: /sbin/init
+    provision_command:
+      - systemctl enable ssh.service
 - name: debian7-ansible-latest
   driver:
     image: rndmh3ro/docker-debian7-ansible:latest

diff --git a/.travis.yml b/.travis.yml
@@ -20,14 +20,19 @@ env:
 #    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 #    version: latest
 
+  - distro: ubuntu1404
+    version: latest
+    init: /sbin/init
+
   - distro: ubuntu1604
     version: latest
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
-  - distro: ubuntu1404
+  - distro: ubuntu1804
     version: latest
-    init: /sbin/init
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
   - distro: debian7
     version: latest