Merge branch 'master' of github.com:Spengreb/atmos

This commit is contained in:
Conor.McManus 2019-06-07 10:17:28 +02:00
commit c6880e40a7
2 changed files with 12 additions and 2 deletions

View file

@ -5,4 +5,14 @@ steps:
- name: test
image: python
commands:
- ./atmos.py --help
- ./atmos.py --help
- name: docker
image: plugins/docker
settings:
username:
from_secret: docker_user
password:
from_secret: docker_password
dockerfile: Dockerfile
repo: spengreb/atmos
tags: latest

View file

@ -1,7 +1,7 @@
FROM ubuntu:xenial
RUN apt-get update -y && apt-get install -y python3 wget unzip git
RUN wget -O /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.11.13/terraform_0.11.13_linux_amd64.zip
RUN wget -O /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.12.0/terraform_0.12.0_linux_amd64.zip
RUN unzip /tmp/terraform.zip
RUN mv terraform /usr/bin/