diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b180b8f1c6a724f7d281c1be8a693129f07a98a0..0000000000000000000000000000000000000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/roles/ -/.idea/ -*.iml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71b9df580298977abd52ded8f751a7b33285839a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,24 +0,0 @@ -include: - project: 'tools/continuous-integration/docker/docker-pure-trunk-latest' - file: 'gitlab-ci.yml' - -########################################################################################################## - -## PIPELINE DEFINITION -stages: - - lint - - pack - - test - - scan - - release - -########################################################################################################## - -#### TEST SECTION -test: - extends: .common_docker - stage: test - variables: - GIT_STRATEGY: "none" - script: - - drr "${CI_REGISTRY_IMAGE}:${CUSTOM_IMAGEPREFIX}-${CI_COMMIT_SHORT_SHA}" ansible --version diff --git a/.hadolint.yaml b/.hadolint.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b2ddf3dd982491cd2723d0a7f80dc55cca03bea4 --- /dev/null +++ b/.hadolint.yaml @@ -0,0 +1,4 @@ +ignored: + - DL3007 + - DL3013 + - DL3018 diff --git a/Dockerfile b/Dockerfile index 76ba49f003cffa1f9840fa91136229c355e97358..3576aed41c10a97c3768ca2d7cfd350b004548d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ -FROM registry.cyberbrain.pw/docker/alpine:latest AS builder -ARG ANSIBLE_BUILD_DEPENDENCIES -ARG ANSIBLE_PACKAGES +FROM registry.viju.ru/tools/docker/alpine:latest AS base + +FROM base AS builder +ARG ANSIBLE_BUILD_DEPENDENCIES="build-base cargo libffi-dev musl-dev openssl-dev python3-dev yaml-dev" +ARG ANSIBLE_PACKAGES="ansible-lint hvac jinja2>=2.11 jmespath mitogen netaddr pyyaml pywinrm" ENV PATH="/opt/ansible/bin:$PATH" RUN apk --no-cache add python3 && \ apk --no-cache add --virtual build-dependencies ${ANSIBLE_BUILD_DEPENDENCIES} && \ @@ -10,8 +12,8 @@ RUN apk --no-cache add python3 && \ #apk del build-dependencies && \ rm -rf /var/cache/apk/* -FROM registry.cyberbrain.pw/docker/alpine:latest AS runtime -ARG ANSIBLE_RUNTIME_DEPENDENCIES +FROM base AS runtime +ARG ANSIBLE_RUNTIME_DEPENDENCIES="ca-certificates git openssh-client openssl patch rsync sshpass yaml" ENV PATH="/opt/ansible/bin:$PATH" WORKDIR /srv/ansible RUN apk --no-cache add python3 && \