Skip to content

Commit

Permalink
Add support for Ubuntu Focal Fossa
Browse files Browse the repository at this point in the history
  • Loading branch information
boutetnico committed Sep 21, 2020
1 parent 39e2e95 commit 24b752b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Supported Platforms

- [Debian - 9 (Stretch)](https://wiki.debian.org/DebianStretch)
- [Debian - 10 (Buster)](https://wiki.debian.org/DebianBuster)
- [Ubuntu - 16.04 (Xenial Xerus)](http://releases.ubuntu.com/16.04/)
- [Ubuntu - 18.04 (Bionic Beaver)](http://releases.ubuntu.com/18.04/)
- [Ubuntu - 20.04 (Focal Fossa)](http://releases.ubuntu.com/20.04/)

Role Variables
--------------
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- xenial
- bionic
- focal
- name: Debian
versions:
- stretch
Expand Down
13 changes: 10 additions & 3 deletions molecule/default/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ FROM {{ item.registry.url }}/{{ item.image }}
FROM {{ item.image }}
{% endif %}

ARG testarg=fail
ENV envarg=$testarg
{% if item.env is defined %}
{% for var, value in item.env.items() %}
{% if value %}
ENV {{ var }} {{ value }}
{% endif %}
{% endfor %}
{% endif %}

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt aptitude && apt-get clean
RUN apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt aptitude && apt-get clean && rm -rf /var/lib/apt/lists/*
4 changes: 2 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ platforms:
image: debian:9
- name: ansible-role-oh-my-zsh-debian-10
image: debian:10
- name: ansible-role-oh-my-zsh-ubuntu-1604
image: ubuntu:16.04
- name: ansible-role-oh-my-zsh-ubuntu-1804
image: ubuntu:18.04
- name: ansible-role-oh-my-zsh-ubuntu-2004
image: ubuntu:20.04

lint: |
yamllint .
Expand Down
10 changes: 5 additions & 5 deletions tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
- name: install dependencies
become: yes
package:
name: '{{ item }}'
apt:
name:
- git
- zsh
state: present
with_items:
- git
- zsh
update_cache: true

- name: clone oh-my-zsh for users
tags:
Expand Down

0 comments on commit 24b752b

Please sign in to comment.