diff --git a/.drone.jsonnet b/.drone.jsonnet index 79f8cbb..4dd961a 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -63,6 +63,25 @@ local PipelineNotifications(depends_on=[]) = { branch: [ "master" ], }, }, + { + name: "readme", + image: "sheogorath/readme-to-dockerhub", + pull: "always", + environment: { + DOCKERHUB_USERNAME: { from_secret: "docker_username" }, + DOCKERHUB_PASSWORD: { from_secret: "docker_password" }, + DOCKERHUB_REPO_PREFIX: "xoxys", + DOCKERHUB_REPO_NAME: "molecule", + README_PATH: "README.md", + SHORT_DESCRIPTION: "Molecule - Automated Ansible roles testing" + }, + when: { + ref: [ + 'refs/heads/master', + 'refs/tags/**', + ], + }, + }, { name: "microbadger", image: "plugins/webhook", diff --git a/docker/Dockerfile.do.linux.amd64 b/docker/Dockerfile.do.linux.amd64 new file mode 100644 index 0000000..dd4d9f0 --- /dev/null +++ b/docker/Dockerfile.do.linux.amd64 @@ -0,0 +1,39 @@ +FROM python:3.7-alpine + +LABEL maintainer="Robert Kaussow " \ + org.label-schema.name="molecule" \ + org.label-schema.vcs-url="https://gitea.rknet.org/docker/molecule" \ + org.label-schema.vendor="Robert Kaussow" \ + org.label-schema.schema-version="1.0" + +ENV PACKAGES="\ + gcc \ + make \ + bash \ + libffi-dev \ + musl-dev \ + openssl-dev \ + python-dev \ + git \ + openssh-client \ +" + +ENV PIP_PACKAGES="\ + ansible~=2.7.0 \ + molecule[digitalocean] \ + virtualenv \ + pycrypto \ +" + +COPY ./ec2-entrypoint.sh /docker-entrypoint.sh + +RUN \ + apk update \ + && apk add --update --no-cache ${PACKAGES} \ + && rm -rf /var/cache/apk/* \ + && pip install --upgrade pip \ + && pip install --no-cache-dir ${PIP_PACKAGES} \ + && rm -rf /root/.cache \ + +USER root +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/ec2-entrypoint.sh b/ec2-entrypoint.sh index c50227a..b07b81f 100755 --- a/ec2-entrypoint.sh +++ b/ec2-entrypoint.sh @@ -13,10 +13,6 @@ if [ "${MOLECULE_CUSTOM_MODULES_REPO}" ]; then fi if [ "${MOLECULE_CUSTOM_FILTERS_REPO}" ]; then - mkdir -p ./plugins/filters/ + mkdir -p ./plugins/filters/ git clone "$MOLECULE_CUSTOM_FILTERS_REPO" ./plugins/filters/ fi - -if [ -f "$MOLECULE_REQUIREMENTS_FILE" ]; then - ansible-galaxy install --force -r "$MOLECULE_REQUIREMENTS_FILE" -p "$ANSIBLE_ROLES_PATH" -fi diff --git a/gce-entrypoint.sh b/gce-entrypoint.sh index a4dbaa3..4b32176 100755 --- a/gce-entrypoint.sh +++ b/gce-entrypoint.sh @@ -27,7 +27,3 @@ if [ "${MOLECULE_CUSTOM_FILTERS_REPO}" ]; then mkdir -p ./plugins/filters/ git clone "$MOLECULE_CUSTOM_FILTERS_REPO" ./plugins/filters/ fi - -if [ -f "$MOLECULE_REQUIREMENTS_FILE" ]; then - ansible-galaxy install --force -r "$MOLECULE_REQUIREMENTS_FILE" -p "$ANSIBLE_ROLES_PATH" -fi