54 Commits

Author SHA1 Message Date
67a16310c6 Merge branch 'development' 2024-07-28 07:07:55 +00:00
Jon
97fac15bf9 Merge branch 'development' into 'master'
chore: release

See merge request nofusscomputing/projects/ansible/execution_environment!262
2024-07-28 07:06:53 +00:00
3ba4f02181 Merge branch 'development' 2024-06-27 15:42:45 +00:00
Jon
ee4f82bdb4 Merge branch 'development' into 'master'
chore: release ver 0.20.0

See merge request nofusscomputing/projects/ansible/execution_environment!257
2024-06-27 15:41:28 +00:00
1f4cffe811 Merge branch 'development' 2024-06-27 08:01:10 +00:00
Jon
08c58eb284 Merge branch 'development' into 'master'
chore: release 0.19.0

See merge request nofusscomputing/projects/ansible/execution_environment!256
2024-06-27 08:00:05 +00:00
1194997a74 Merge branch 'development' 2024-05-03 14:48:50 +00:00
Jon
4472d467e4 Merge branch 'development' into 'master'
chore: Release 0.18.0

See merge request nofusscomputing/projects/ansible/execution_environment!255
2024-05-03 14:47:50 +00:00
d50159c058 Merge branch 'development' 2024-05-02 01:05:19 +00:00
Jon
7af16b5b5a Merge branch 'development' into 'master'
chore: Release 0.1.....

See merge request nofusscomputing/projects/ansible/execution_environment!254
2024-05-02 01:04:16 +00:00
6707a9bd9a Merge branch 'development' 2024-04-25 17:47:19 +00:00
Jon
9a54f418cf Merge branch 'development' into 'master'
chore: release -> 0.17.0

See merge request nofusscomputing/projects/ansible/execution_environment!252
2024-04-25 17:46:18 +00:00
2ef2641d47 Merge branch 'development' 2024-04-24 03:50:34 +00:00
Jon
b8e95cb06c Merge branch 'development' into 'master'
chore: release -> 0.16.0

See merge request nofusscomputing/projects/ansible/execution_environment!247
2024-04-24 03:49:29 +00:00
16f2ad04f3 Merge branch 'development' 2024-03-17 07:57:40 +00:00
Jon
4a2ba92388 Merge branch 'development' into 'master'
chore: release

See merge request nofusscomputing/projects/ansible/execution_environment!244
2024-03-17 07:56:40 +00:00
1f7519f37d Merge branch 'development' 2024-03-14 13:31:42 +00:00
Jon
53596b146e Merge branch 'development' into 'master'
chore: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!239
2024-03-14 13:30:26 +00:00
493812e8dc Merge branch 'development' 2024-02-08 15:33:40 +00:00
Jon
dabfb9f153 Merge branch 'development' into 'master'
fix: failed to parse JSON

See merge request nofusscomputing/projects/ansible/execution_environment!213
2024-02-08 15:32:38 +00:00
7dd76ea5dd Merge branch 'development' 2024-02-07 06:05:10 +00:00
Jon
e4f53b7870 Merge branch 'development' into 'master'
build: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!209
2024-02-07 06:04:06 +00:00
e81bd01e8c Merge branch 'development' 2024-01-14 19:30:03 +00:00
Jon
fe598051bf Merge branch 'development' into 'master'
feat(ansible_playbooks): updated submodule ansible_playbooks

See merge request nofusscomputing/projects/ansible/execution_environment!185
2024-01-14 19:29:01 +00:00
9bc5392e50 Merge branch 'development' 2024-01-01 08:06:45 +00:00
Jon
b429c97495 Merge branch 'development' into 'master'
chore: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!177
2024-01-01 08:05:10 +00:00
88034af87d Merge branch 'development' 2023-12-09 14:14:46 +00:00
Jon
6a268594a9 Merge branch 'development' into 'master'
chore: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!152
2023-12-09 14:13:46 +00:00
b807d027d2 Merge branch 'development' 2023-12-09 08:00:08 +00:00
Jon
a47a816fa5 Merge branch 'development' into 'master'
chore: release bugfix

See merge request nofusscomputing/projects/ansible/execution_environment!151
2023-12-09 07:59:06 +00:00
001a6772ea Merge branch 'development' 2023-12-08 12:56:03 +00:00
Jon
fec15a5c3c Merge branch 'development' into 'master'
chore: release ansible-core update fixes to stable

See merge request nofusscomputing/projects/ansible/execution_environment!149
2023-12-08 12:55:02 +00:00
f667038d1a Merge branch 'development' 2023-12-05 06:10:11 +00:00
Jon
26c8de0d67 Merge branch 'development' into 'master'
chore: release

See merge request nofusscomputing/projects/ansible/execution_environment!134
2023-12-05 06:09:13 +00:00
def1eb3bb5 Merge branch 'development' 2023-12-05 04:36:58 +00:00
Jon
a0ff0f5318 Merge branch 'development' into 'master'
chore: release

See merge request nofusscomputing/projects/ansible/execution_environment!130
2023-12-05 04:35:52 +00:00
864b183a66 Merge branch 'development' 2023-11-30 07:02:17 +00:00
Jon
939d960cc1 Merge branch 'development' into 'master'
chore: release as stable

See merge request nofusscomputing/projects/ansible/execution_environment!124
2023-11-30 07:01:09 +00:00
69492c04b8 Merge branch 'development' 2023-11-14 13:07:30 +00:00
Jon
e31e5e14e1 Merge branch 'development' into 'master'
build: release as stable

See merge request nofusscomputing/projects/ansible/execution_environment!115
2023-11-14 13:06:28 +00:00
84693d54ea Merge branch 'development' 2023-11-12 04:01:13 +00:00
Jon
ff53ef8ab1 Merge branch 'development' into 'master'
chore(git): updated submodule ansible-roles

See merge request nofusscomputing/projects/ansible/execution_environment!111
2023-11-12 03:59:44 +00:00
8fedf67148 Merge branch 'development' 2023-10-21 02:33:06 +00:00
Jon
e3e599ce59 Merge branch 'development' into 'master'
chore: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!96
2023-10-21 02:31:55 +00:00
adc58a4648 Merge branch 'development' 2023-10-16 03:49:41 +00:00
Jon
160c5ec9a5 Merge branch 'development' into 'master'
fix(execution_environment): ansible runner required

See merge request nofusscomputing/projects/ansible/execution_environment!94
2023-10-16 03:48:33 +00:00
0ebd86748e Merge branch 'development' 2023-09-02 06:38:14 +00:00
Jon
ac8e9e44ed Merge branch 'development' into 'master'
chore: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!92
2023-09-02 06:37:04 +00:00
8847fc1f9d Merge branch 'development' 2023-07-04 07:13:24 +00:00
Jon
99398d1574 Merge branch 'development' into 'master'
build: release to stable

See merge request nofusscomputing/projects/ansible/execution_environment!87
2023-07-04 07:04:26 +00:00
415855faad Merge branch 'development' 2023-06-15 04:57:09 +00:00
Jon
6a14049442 Merge branch 'development' into 'master'
chore: next release

See merge request nofusscomputing/projects/ansible/execution_environment!6
2023-06-15 04:48:06 +00:00
188bf92ff3 Merge branch 'development' 2023-05-15 02:08:56 +00:00
Jon
2f26dc6997 Merge branch 'development' into 'master'
chore: re merge due to branch permission error

See merge request nofusscomputing/projects/ansible/execution_environment!5
2023-05-15 02:07:19 +00:00
6 changed files with 13 additions and 68 deletions

View File

@ -17,7 +17,6 @@ include:
- template/automagic.gitlab-ci.yaml
#- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665
.MKDocs_Build:
image: python:3.11-buster
@ -62,57 +61,3 @@ Build/Cache Python Packages:
allow_failure: true
when: manual
- when: never
Docker Container:
extends: .build_docker_container
resource_group: build
needs: []
script:
- update-binfmts --display
- |
if [ "0$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS" != "0" ]; then
echo "[DEBUG] building multiarch/specified arch image";
docker buildx build --platform=$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS . \
--label org.opencontainers.image.created="$(date '+%Y-%m-%d %H:%M:%S%:z')" \
--label org.opencontainers.image.documentation="$CI_PROJECT_URL" \
--label org.opencontainers.image.source="$CI_PROJECT_URL" \
--label org.opencontainers.image.revision="$CI_COMMIT_SHA" \
--push \
--build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --build-arg CI_PROJECT_ID=$CI_PROJECT_ID --build-arg CI_API_V4_URL=$CI_API_V4_URL \
--build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA \
--file $DOCKER_DOCKERFILE \
--tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
# during docker multi platform build there are >=3 additional unknown images added to gitlab container registry. cleanup
DOCKER_MULTI_ARCH_IMAGES=$(docker buildx imagetools inspect "$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG" --format "{{ range .Manifest.Manifests }}{{ if ne (print .Platform) \"&{unknown unknown [] }\" }}$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG@{{ println .Digest }}{{end}} {{end}}");
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
else
echo "[DEBUG] building image";
docker build . \
--label org.opencontainers.image.created="$(date '+%Y-%m-%d %H:%M:%S%:z')" \
--label org.opencontainers.image.documentation="$CI_PROJECT_URL" \
--label org.opencontainers.image.source="$CI_PROJECT_URL" \
--label org.opencontainers.image.url="$CI_PROJECT_URL/-/releases/$(cz -n cz_nfc version --project)" \
--label org.opencontainers.image.version="$(cz -n cz_nfc version --project)" \
--label org.opencontainers.image.revision="$CI_COMMIT_SHA" \
--build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --build-arg CI_PROJECT_ID=$CI_PROJECT_ID --build-arg CI_API_V4_URL=$CI_API_V4_URL \
--build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA \
--file $DOCKER_DOCKERFILE \
--tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
docker push $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
fi

View File

@ -8,8 +8,6 @@
![Project Status - Active](https://img.shields.io/badge/Project%20Status-Active-green?logo=gitlab&style=plastic)
[![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/ansible-ee?style=plastic&logo=docker&color=0db7ed)](https://hub.docker.com/r/nofusscomputing/ansible-ee) [![Artifact Hub](https://img.shields.io/endpoint?style=plastic&url=https://artifacthub.io/badge/repository/nfc-ansible-ee)](https://artifacthub.io/packages/container/nfc-ansible-ee/ansible-ee)
<br>
![Gitlab forks count](https://img.shields.io/badge/dynamic/json?label=Forks&query=%24.forks_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45741845%2F&color=ff782e&logo=gitlab&style=plastic) ![Gitlab stars](https://img.shields.io/badge/dynamic/json?label=Stars&query=%24.star_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45741845%2F&color=ff782e&logo=gitlab&style=plastic) [![Open Issues](https://img.shields.io/badge/dynamic/json?color=ff782e&logo=gitlab&style=plastic&label=Open%20Issues&query=%24.statistics.counts.opened&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45741845%2Fissues_statistics)](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues)

View File

@ -2,7 +2,6 @@ ARG release_name=bookworm
ARG kubernetes_version=1.29
ARG CI_COMMIT_SHA=""
FROM --platform=$TARGETPLATFORM quay.io/ansible/receptor:v1.4.4 as receptor
@ -34,9 +33,7 @@ RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v${kubernetes_version}/deb/Rele
FROM --platform=$TARGETPLATFORM python:3.11-slim-${release_name}
ARG CI_COMMIT_SHA
ENV REPO_BUILD_SHA=${CI_COMMIT_SHA}
# Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283
ENV LC_ALL en_US.UTF-8
@ -52,11 +49,16 @@ COPY includes /
# Ref: https://github.com/opencontainers/image-spec/blob/d86384efdb8c30770a92415c100f57a9bffbb64e/annotations.md
LABEL \
# org.opencontainers.image.authors="{contributor url}" \
org.opencontainers.image.vendor="No Fuss Computing" \
org.opencontainers.image.title="Ansible Execution Environment" \
org.opencontainers.image.description="An ansible execution environment for aap/awx and CI/CD pipelines" \
org.opencontainers.image.vendor="No Fuss Computing" \
io.artifacthub.package.license="MIT"
# org.opencontainers.image.url="{dockerhub url}" \
# org.opencontainers.image.documentation="{docs url}" \
# org.opencontainers.image.source="{repo url}" \
# org.opencontainers.image.revision="{git commit sha at time of build}" \
org.opencontainers.image.title="No Fuss Computings Ansible Execution Environment" \
org.opencontainers.image.description="An ansible execution environment for awx/tower and CI/CD pipelines" \
org.opencontainers.image.vendor="No Fuss Computing"
# org.opencontainers.image.version="{git tag}"
RUN apt update \
@ -146,5 +148,5 @@ RUN ansible-galaxy collection install \
theforeman.foreman==4.0.0; \
ansible-galaxy collection install --pre \
nofusscomputing.glpi==0.1.0-a1 \
nofusscomputing.kubernetes==1.13.2 \
nofusscomputing.kubernetes==1.13.0 \
nofusscomputing.netbox==0.4.0