From 715950e5da291ec7af26069095ebb3688f21b463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=B0?=
=?UTF-8?q?=D1=84=D1=80=D0=BE=D0=BD=D0=BE=D0=B2?= <zimniy@cyberbrain.pw>
Date: Wed, 16 Mar 2022 13:19:53 +0300
Subject: [PATCH] New
---
.gitignore | 3 ---
.gitlab-ci.yml | 24 ------------------------
.hadolint.yaml | 4 ++++
Dockerfile | 12 +++++++-----
4 files changed, 11 insertions(+), 32 deletions(-)
delete mode 100644 .gitignore
create mode 100644 .hadolint.yaml
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/.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/.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..3576aed 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 && \
--
GitLab