From 221f9a7d7ad4990ffad4ef2bccf9c57e6cacadaf Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 26 Jan 2021 12:37:19 +0100 Subject: [PATCH] cleanup --- .github/issue_template.md | 9 -------- .github/pull_request_template.md | 0 .github/settings.yml | 36 +++++++++----------------------- LICENSE | 14 +------------ README.md | 15 +++++++------ docker/Dockerfile.linux.amd64 | 2 +- docker/Dockerfile.linux.arm | 2 +- docker/Dockerfile.linux.arm64 | 12 ++++++----- 8 files changed, 27 insertions(+), 63 deletions(-) delete mode 100644 .github/issue_template.md delete mode 100644 .github/pull_request_template.md diff --git a/.github/issue_template.md b/.github/issue_template.md deleted file mode 100644 index 3f95605..0000000 --- a/.github/issue_template.md +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index e69de29..0000000 diff --git a/.github/settings.yml b/.github/settings.yml index a1e4d90..47b3f3e 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,11 +1,12 @@ repository: name: drone-ansible description: Drone plugin to provision via Ansible - homepage: http://plugins.drone.io/drone-plugins/drone-ansible + homepage: https://hub.docker.com/r/owncloudci/drone-ansible topics: drone, drone-plugin private: false has_issues: true + has_projects: false has_wiki: false has_downloads: false @@ -19,6 +20,9 @@ labels: - name: bug color: d73a4a description: Something isn't working + - name: documentation + color: 0075ca + description: Improvements or additions to documentation - name: duplicate color: cfd3d7 description: This issue or pull request already exists @@ -37,39 +41,19 @@ labels: - name: question color: d876e3 description: Further information is requested - - name: renovate - color: e99695 - description: Automated action from Renovate - name: wontfix color: ffffff description: This will not be worked on -teams: - - name: Admins - permission: admin - - name: Captain - permission: admin - - name: Maintainers - permission: push - branches: - name: master protection: - required_pull_request_reviews: - required_approving_review_count: 1 - dismiss_stale_reviews: false - require_code_owner_reviews: false - dismissal_restrictions: - teams: - - Admins - - Captain + required_pull_request_reviews: null required_status_checks: strict: true contexts: - continuous-integration/drone/pr - enforce_admins: false - restrictions: - users: [] - teams: - - Admins - - Captain + enforce_admins: null + restrictions: null + +--- diff --git a/LICENSE b/LICENSE index 8f71f43..86a97ab 100644 --- a/LICENSE +++ b/LICENSE @@ -175,18 +175,7 @@ END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} + Copyright 2021 ownCloud GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -199,4 +188,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - diff --git a/README.md b/README.md index 3562147..2b876f6 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,9 @@ # drone-ansible -[![Build Status](http://cloud.drone.io/api/badges/drone-plugins/drone-ansible/status.svg)](http://cloud.drone.io/drone-plugins/drone-ansible) -[![Gitter chat](https://badges.gitter.im/drone/drone.png)](https://gitter.im/drone/drone) -[![Join the discussion at https://discourse.drone.io](https://img.shields.io/badge/discourse-forum-orange.svg)](https://discourse.drone.io) -[![Drone questions at https://stackoverflow.com](https://img.shields.io/badge/drone-stackoverflow-orange.svg)](https://stackoverflow.com/questions/tagged/drone.io) -[![](https://images.microbadger.com/badges/image/plugins/ansible.svg)](https://microbadger.com/images/plugins/ansible "Get your own image badge on microbadger.com") -[![Go Doc](https://godoc.org/github.com/drone-plugins/drone-ansible?status.svg)](http://godoc.org/github.com/drone-plugins/drone-ansible) -[![Go Report](https://goreportcard.com/badge/github.com/drone-plugins/drone-ansible)](https://goreportcard.com/report/github.com/drone-plugins/drone-ansible) +[![Build Status](https://drone.owncloud.com/api/badges/owncloud-ci/hugo/status.svg)](https://drone.owncloud.com/owncloud-ci/hugo/) +[![Docker Hub](https://img.shields.io/badge/docker-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/owncloudci/hugo) -Drone plugin to provision infrastructure with [Ansible](https://www.ansible.com/). For the usage information and a listing of the available options please take a look at [the docs](http://plugins.drone.io/drone-plugins/drone-ansible/). +Drone plugin to provision infrastructure with [Ansible](https://www.ansible.com/). ## Build @@ -45,3 +40,7 @@ docker run --rm \ -w $(pwd) \ plugins/ansible ``` + +## License + +This project is licensed under the Apache 2.0 License - see the [LICENSE](https://github.com/owncloud-ci/drone-ansible/blob/master/LICENSE) file for details. diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 0c15238..5b494da 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -7,7 +7,7 @@ LABEL maintainer="Drone.IO Community " \ RUN apk add --no-cache bash git curl rsync openssh-client sshpass py3-pip py3-requests py3-paramiko python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ - pip3 install ansible==2.10.0 boto3==1.13.10 && \ + pip3 install ansible==2.10.5 boto3 hcloud && \ apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/amd64/drone-ansible /bin/ diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 5d06d36..dbac010 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -7,7 +7,7 @@ LABEL maintainer="Drone.IO Community " \ RUN apk add --no-cache bash git curl rsync openssh-client sshpass py3-pip py3-requests py3-paramiko python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ - pip3 install ansible==2.10.0 boto3==1.13.10 && \ + pip3 install ansible==2.10.5 boto3 hcloud && \ apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/arm/drone-ansible /bin/ diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index cf2516b..f2d5c22 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,13 +1,15 @@ FROM plugins/base:linux-arm64 -LABEL maintainer="Drone.IO Community " \ - org.label-schema.name="Drone Ansible" \ - org.label-schema.vendor="Drone.IO Community" \ - org.label-schema.schema-version="1.0" +LABEL maintainer="ownCloud DevOps " +LABEL org.opencontainers.image.authors="ownCloud DevOps " +LABEL org.opencontainers.image.title="drone-ansible" +LABEL org.opencontainers.image.url="https://github.com/owncloud-ci/drone-ansible" +LABEL org.opencontainers.image.source="https://github.com/owncloud-ci/drone-ansible" +LABEL org.opencontainers.image.documentation="https://github.com/owncloud-ci/drone-ansible" RUN apk add --no-cache bash git curl rsync openssh-client sshpass py3-pip py3-requests py3-paramiko python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ - pip3 install ansible==2.10.0 boto3==1.13.10 && \ + pip3 install ansible==2.10.5 boto3 hcloud && \ apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/arm64/drone-ansible /bin/