From 71196252ee309124da6e0b47ecc13e5bb5d91bdd Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Fri, 24 May 2019 18:33:20 +0200 Subject: [PATCH] #2 fixed and changed drone.yml --- .drone.yml | 63 +++++++++++++++++++++++++++++++++++-------------- arch/Dockerfile | 8 +------ 2 files changed, 46 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index 48804a3..29f9534 100644 --- a/.drone.yml +++ b/.drone.yml @@ -91,92 +91,119 @@ pipeline: event: [ push, pull_request ] build-ubuntu-18-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: ubuntu-18.04 dockerfile: ubuntu-18.04/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-ubuntu-16-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: ubuntu-16.04 dockerfile: ubuntu-16.04/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-ubuntu-14-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: ubuntu-14.04 dockerfile: ubuntu-14.04/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-fedora-24-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: fedora-24 dockerfile: fedora-24/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-alpine-3-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: alpine-3 dockerfile: alpine-3/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-debian-8-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: debian-8 dockerfile: debian-8/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-debian-7-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: debian-7 dockerfile: debian-8/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-centos-7-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: centos-7 dockerfile: centos-7/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] build-arch-publish: - group: build + group: release image: plugins/docker repo: lerentis/ansible tag: arch dockerfile: arch/Dockerfile - secrets: [ docker_username, docker_password ] + username: + from_secret: docker_username + password: + from_secret: docker_password when: event: [ tag ] diff --git a/arch/Dockerfile b/arch/Dockerfile index e6da850..9727671 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -1,11 +1,5 @@ FROM archlinux/base -RUN echo "[archlinuxfr]" >> /etc/pacman.conf && \ - echo "SigLevel = Never" >> /etc/pacman.conf && \ - echo "Server = http://repo.archlinux.fr/x86_64" >> /etc/pacman.conf - -RUN pacman -Syuu --noconfirm && pacman -S yaourt ansible sshpass python2-passlib python2-netaddr python2-pywinrm python2-dnspython python2-ovirt-engine-sdk python2-jmespath python2-requests-ntlm python2-requests-kerberos python2-requests-credssp git --noconfirm - -RUN rm /usr/bin/python && ln -s /usr/bin/python2.7 /usr/bin/python +RUN pacman -Syuu --noconfirm && pacman -S python ansible sshpass git --noconfirm CMD ["ansible-playbook", "--help"]