diff --git a/Containerfile b/Containerfile index 36dd657..df59e9a 100644 --- a/Containerfile +++ b/Containerfile @@ -1,34 +1,15 @@ -ARG ANSIBLE_RUNNER_IMAGE=quay.io/ansible/ansible-runner:devel -ARG PYTHON_BUILDER_IMAGE=quay.io/ansible/python-builder:latest -ARG ANSIBLE_RECEPTOR_IMAGE=quay.io/project-receptor/receptor:0.9.7 +FROM quay.io/ansible/awx-ee:0.2.0 -FROM $ANSIBLE_RUNNER_IMAGE as galaxy +ADD requirements_new.txt /tmp/requirements.txt +ADD bashrc /home/runner/.bashrc -ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS= -ADD _build /build - -WORKDIR /build -RUN ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles -RUN ansible-galaxy collection install $ANSIBLE_GALAXY_CLI_COLLECTION_OPTS -r requirements.yml --collections-path /usr/share/ansible/collections - -FROM $PYTHON_BUILDER_IMAGE as builder -ADD _build/requirements_combined.txt /tmp/src/requirements.txt -ADD _build/bindep_combined.txt /tmp/src/bindep.txt -RUN assemble - -FROM $ANSIBLE_RECEPTOR_IMAGE as receptor -FROM $ANSIBLE_RUNNER_IMAGE - -COPY --from=galaxy /usr/share/ansible /usr/share/ansible - -COPY --from=builder /output/ /output/ -RUN /output/install-from-bindep && rm -rf /output/wheels -RUN alternatives --set python /usr/bin/python3 && \ +RUN ansible-galaxy collection install community.general && \ + pip3 install -r /tmp/requirements.txt && \ curl -L https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz -o /tmp/helm.tgz && \ - tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm -COPY --from=receptor /usr/bin/receptor /usr/bin/receptor -RUN mkdir -p /var/run/receptor -ADD run.sh /run.sh + mkdir /home/runner/bin && \ + tar -zxvf /tmp/helm.tgz --strip-components=1 -C /home/runner/bin/ linux-amd64/helm && \ + ln -s /home/runner/bin/mariadb-dump /home/runner/bin/mysqldump +COPY mariadb-dump /home/runner/bin/ CMD /run.sh USER 1000 RUN git lfs install diff --git a/Containerfile.new b/Containerfile.new new file mode 100644 index 0000000..36dd657 --- /dev/null +++ b/Containerfile.new @@ -0,0 +1,34 @@ +ARG ANSIBLE_RUNNER_IMAGE=quay.io/ansible/ansible-runner:devel +ARG PYTHON_BUILDER_IMAGE=quay.io/ansible/python-builder:latest +ARG ANSIBLE_RECEPTOR_IMAGE=quay.io/project-receptor/receptor:0.9.7 + +FROM $ANSIBLE_RUNNER_IMAGE as galaxy + +ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS= +ADD _build /build + +WORKDIR /build +RUN ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles +RUN ansible-galaxy collection install $ANSIBLE_GALAXY_CLI_COLLECTION_OPTS -r requirements.yml --collections-path /usr/share/ansible/collections + +FROM $PYTHON_BUILDER_IMAGE as builder +ADD _build/requirements_combined.txt /tmp/src/requirements.txt +ADD _build/bindep_combined.txt /tmp/src/bindep.txt +RUN assemble + +FROM $ANSIBLE_RECEPTOR_IMAGE as receptor +FROM $ANSIBLE_RUNNER_IMAGE + +COPY --from=galaxy /usr/share/ansible /usr/share/ansible + +COPY --from=builder /output/ /output/ +RUN /output/install-from-bindep && rm -rf /output/wheels +RUN alternatives --set python /usr/bin/python3 && \ + curl -L https://get.helm.sh/helm-v3.5.4-linux-amd64.tar.gz -o /tmp/helm.tgz && \ + tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm +COPY --from=receptor /usr/bin/receptor /usr/bin/receptor +RUN mkdir -p /var/run/receptor +ADD run.sh /run.sh +CMD /run.sh +USER 1000 +RUN git lfs install diff --git a/bashrc b/bashrc new file mode 100644 index 0000000..5ca4e18 --- /dev/null +++ b/bashrc @@ -0,0 +1 @@ +export PATH=$PATH:/home/runner/bin/ diff --git a/mariadb-dump b/mariadb-dump new file mode 100755 index 0000000..bd1f1c6 Binary files /dev/null and b/mariadb-dump differ diff --git a/requirements_new.txt b/requirements_new.txt new file mode 100644 index 0000000..29473fd --- /dev/null +++ b/requirements_new.txt @@ -0,0 +1,5 @@ +ansible-modules-hashivault +hvac +pymysql +psutil +boto3