From cb076f00e789319eb0957fac0ec52bb4e07f1014 Mon Sep 17 00:00:00 2001
From: Dmitriy Safronov <zimniy@cyberbrain.pw>
Date: Wed, 16 Mar 2022 00:46:48 +0300
Subject: [PATCH 1/3] new

---
 .hadolint.yaml | 4 ++++
 Dockerfile     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .hadolint.yaml

diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..b2ddf3d
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,4 @@
+ignored:
+  - DL3007
+  - DL3013
+  - DL3018
diff --git a/Dockerfile b/Dockerfile
index 76ba49f..99fb125 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM registry.cyberbrain.pw/docker/alpine:latest AS builder
+FROM registry.cyberbrain.pw/tools/docker/alpine:latest AS base
+
+FROM base AS builder
 ARG ANSIBLE_BUILD_DEPENDENCIES
 ARG ANSIBLE_PACKAGES
 ENV PATH="/opt/ansible/bin:$PATH"
@@ -10,7 +12,7 @@ RUN apk --no-cache add python3 && \
     #apk del build-dependencies && \
     rm -rf /var/cache/apk/*
 
-FROM registry.cyberbrain.pw/docker/alpine:latest AS runtime
+FROM base AS runtime
 ARG ANSIBLE_RUNTIME_DEPENDENCIES
 ENV PATH="/opt/ansible/bin:$PATH"
 WORKDIR /srv/ansible
-- 
GitLab


From 5ee429b525bd41378327abd541ea2097f5887749 Mon Sep 17 00:00:00 2001
From: Dmitriy Safronov <zimniy@cyberbrain.pw>
Date: Wed, 16 Mar 2022 13:03:47 +0300
Subject: [PATCH 2/3] new

---
 .gitlab-ci.yml | 24 ------------------------
 Dockerfile     |  6 +++---
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71b9df5..e69de29 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/Dockerfile b/Dockerfile
index 99fb125..8cf9499 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM registry.cyberbrain.pw/tools/docker/alpine:latest AS base
 
 FROM base AS builder
-ARG ANSIBLE_BUILD_DEPENDENCIES
-ARG ANSIBLE_PACKAGES
+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} && \
@@ -13,7 +13,7 @@ RUN apk --no-cache add python3 && \
     rm -rf /var/cache/apk/*
 
 FROM base AS runtime
-ARG ANSIBLE_RUNTIME_DEPENDENCIES
+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 && \
-- 
GitLab


From c478fb15c51a4b78bbf679c7eb38175c8e292aa4 Mon Sep 17 00:00:00 2001
From: Dmitriy Safronov <zimniy@cyberbrain.pw>
Date: Wed, 16 Mar 2022 13:07:55 +0300
Subject: [PATCH 3/3] new

---
 .gitignore | 3 ---
 Dockerfile | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b180b8f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/roles/
-/.idea/
-*.iml
diff --git a/Dockerfile b/Dockerfile
index 8cf9499..3576aed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.cyberbrain.pw/tools/docker/alpine:latest AS base
+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"
-- 
GitLab