Skip to content

Commit 6bd506a

Browse files
committed
Support Ubuntu 16.04 LTS
1 parent 4f27de0 commit 6bd506a

File tree

7 files changed

+30
-3
lines changed

7 files changed

+30
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
- OS=jessie64 PROCESS_CONTROL=systemd
1212
- OS=jessie64 PROCESS_CONTROL=supervisor
1313
- OS=trusty64 PROCESS_CONTROL=supervisor
14+
- OS=xenial64 PROCESS_CONTROL=systemd
1415
- OS=centos7 PROCESS_CONTROL=systemd
1516
before_install:
1617
- sudo -E ./scripts/install-docker.sh

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ This role installs vanilla [Minecraft](https://minecraft.net/) and configures it
1515

1616
## Features
1717

18-
* supports Debian 8, Ubuntu 14.04, and RHEL/CentOS 7
18+
* supports Debian 8, Ubuntu 14.04, Ubuntu 16.04, and RHEL/CentOS 7
1919
* supports different process supervisors on different platforms
2020

2121
| OS | Supervisor | systemd |
2222
|--------------|:----------:|:-------:|
2323
| Debian 8 |||
2424
| Ubuntu 14.04 || |
25+
| Ubuntu 16.04 | ||
2526
| CentOS 7 | ||
2627

2728
* safely stops the server using [`stop`](http://minecraft.gamepedia.com/Commands#stop) when running under **systemd**

docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ services:
1111
trusty64:
1212
build: docker/trusty64/
1313
entrypoint: /sbin/init
14+
xenial64:
15+
build: docker/xenial64/
16+
privileged: true
17+
entrypoint: /sbin/init

docker/xenial64/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# vim: set ft=dockerfile:
2+
3+
FROM ubuntu:xenial
4+
5+
# Colour output.
6+
ENV TERM=xterm
7+
8+
RUN apt-get update -y \
9+
&& apt-get install -y software-properties-common \
10+
&& apt-add-repository ppa:ansible/ansible \
11+
&& apt-get update -y \
12+
&& apt-get --no-install-recommends install -y \
13+
ansible \
14+
net-tools \
15+
ruby2.3 \
16+
&& apt-get autoremove \
17+
&& apt-get clean \
18+
&& rm -rf /var/lib/apt/lists/*
19+
20+
RUN gem2.3 install serverspec

meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
- name: Ubuntu
99
versions:
1010
- trusty
11+
- xenial
1112
- name: Debian
1213
versions:
1314
- wheezy

tasks/systemd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- include: systemd/Ubuntu.yml
3-
when: ansible_distribution == 'Ubuntu'
3+
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('16.04', '<')
44

55
- name: install units
66
template:

tasks/systemd/Ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
- name: check supported version
22
fail:
3-
msg="Using systemd with {{ ansible_distribution }} is not supported. Use Supervisor instead."
3+
msg: Using systemd with {{ ansible_distribution }} {{ ansible_distribution_version }} is not supported. Use Supervisor instead."

0 commit comments

Comments
 (0)