From 4381f7f2475fbc5157b02143936e140d7788fb41 Mon Sep 17 00:00:00 2001 From: sjoshi10 Date: Wed, 3 May 2023 12:37:54 -0400 Subject: [PATCH 1/8] add image --- Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 8e61bdf..7fec121 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -47,7 +47,7 @@ RUN apt-get clean \ && echo 'ansible-10000 ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/ansible RUN gem install bundler - +RUN pip3 install jmespath WORKDIR /mnt USER ansible-10000 From db3987225cb22d53fdaac0f3529d6ac452176780 Mon Sep 17 00:00:00 2001 From: sjoshi10 Date: Wed, 3 May 2023 12:38:42 -0400 Subject: [PATCH 2/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 77c1e7c..2d9fd39 100644 --- a/README.md +++ b/README.md @@ -86,3 +86,4 @@ In a second terminal run the following which will do an Ansible ping to that Pyt ```console # docker run --rm -v /var/run/docker.sock:/var/run/docker.sock haxorof/ansible-core sh -c "echo 'target ansible_connection=docker' > hosts && ansible -m ping -i hosts all" ``` + From 8075217c57d91814a48cebb4f5b1400083d66d73 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Wed, 23 Aug 2023 15:01:34 -0700 Subject: [PATCH 3/8] Add 1password cli to Dockerfile.ubuntu --- Dockerfile.ubuntu | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 7fec121..10f91bc 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -14,7 +14,17 @@ ONBUILD USER root COPY requirements/requirements.txt ./requirements.txt -RUN apt-get clean \ +RUN \ + apt update \ + && apt -y install \ + curl \ + gnupg \ + # Instructions for installing 1password cli: https://support.1password.com/install-linux/#get-1password-for-linux + && curl -sS https://downloads.1password.com/linux/keys/1password.asc | gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | tee /etc/apt/sources.list.d/1password.list \ + && mkdir -p /etc/debsig/policies/AC2D62742012EA22/ \ + && curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | tee /etc/debsig/policies/AC2D62742012EA22/1password.policies \ + && apt-get -y clean \ && apt-get -y update \ && apt-get -y install apt-utils \ && apt-get -y upgrade \ @@ -28,6 +38,7 @@ RUN apt-get clean \ curl \ tzdata \ cargo \ + 1password-cli \ # install gosu for a better su+exec command (remove sudo if this works) && wget -O /usr/bin/gosu "https://github.com/tianon/gosu/releases/download/$gosu_version/gosu-amd64" \ && chmod +x /usr/bin/gosu \ From 51fc2e6ea56d15437cd57e1e89b6a5215f2374f8 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Wed, 23 Aug 2023 15:15:20 -0700 Subject: [PATCH 4/8] Add 1password cli to Dockerfile.alpine --- Dockerfile.alpine | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 8e0681e..fd0232a 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -14,7 +14,11 @@ ONBUILD USER root COPY requirements/requirements.txt ./requirements.txt -RUN apk update \ +RUN \ + # Instructions for installing 1password cli: https://developer.1password.com/docs/cli/get-started/ + echo https://downloads.1password.com/linux/alpinelinux/stable/ >> /etc/apk/repositories \ + && wget "https://downloads.1password.com/linux/keys/alpinelinux/support@1password.com-61ddfc31.rsa.pub" -P /etc/apk/keys \ + && apk update \ && apk add --no-cache linux-headers \ build-base \ libffi-dev \ @@ -25,6 +29,7 @@ RUN apk update \ sudo \ tzdata \ cargo \ + 1password-cli \ # install gosu for a better su+exec command (remove sudo if this works) && wget -O /usr/bin/gosu "https://github.com/tianon/gosu/releases/download/$gosu_version/gosu-amd64" \ && chmod +x /usr/bin/gosu \ From e5ac30911f42b8b99614abc03ebd245ee4353fe0 Mon Sep 17 00:00:00 2001 From: sjoshi10 Date: Thu, 24 Aug 2023 10:41:38 -0400 Subject: [PATCH 5/8] bump ubuntu version bump ubuntu version to 22.04 --- Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 10f91bc..1fec8d3 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 LABEL org.opencontainers.image.title="haxorof/ansible-core" \ org.opencontainers.image.description="Ansible Core + additions" \ From dc6bea58f8b020e828bbed6ba8b7f3b7523624e7 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Wed, 6 Sep 2023 13:22:21 -0700 Subject: [PATCH 6/8] Add rsync binary --- Dockerfile.alpine | 1 + Dockerfile.ubuntu | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index fd0232a..66feb58 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -29,6 +29,7 @@ RUN \ sudo \ tzdata \ cargo \ + rsync \ 1password-cli \ # install gosu for a better su+exec command (remove sudo if this works) && wget -O /usr/bin/gosu "https://github.com/tianon/gosu/releases/download/$gosu_version/gosu-amd64" \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 1fec8d3..5a8922f 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -38,6 +38,7 @@ RUN \ curl \ tzdata \ cargo \ + rsync \ 1password-cli \ # install gosu for a better su+exec command (remove sudo if this works) && wget -O /usr/bin/gosu "https://github.com/tianon/gosu/releases/download/$gosu_version/gosu-amd64" \ From 2de27fb81378444bbf68c13d29f0c467dac50a0d Mon Sep 17 00:00:00 2001 From: sjoshi10 Date: Mon, 16 Oct 2023 12:38:51 -0400 Subject: [PATCH 7/8] bump version --- requirements/v2.15/requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 requirements/v2.15/requirements.txt diff --git a/requirements/v2.15/requirements.txt b/requirements/v2.15/requirements.txt new file mode 100644 index 0000000..6b939ed --- /dev/null +++ b/requirements/v2.15/requirements.txt @@ -0,0 +1 @@ +ansible-core==2.15.3 From a06c8623d8cc950510839d066bef1a14e196fefd Mon Sep 17 00:00:00 2001 From: sjoshi10 Date: Mon, 16 Oct 2023 12:51:23 -0400 Subject: [PATCH 8/8] bump version --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd7822d..ff98671 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ on: env: IMAGE_NAME: sjoshi10/ansible-core LATEST_OS: alpine - LATEST_VERSION: v2.13 + LATEST_VERSION: v2.15 DOCKER_CLI_VERSION: "20.10.14" GOSU_VERSION: "1.14" @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [alpine, ubuntu] - version: [v2.12, v2.13] + version: [v2.12, v2.13,v2.15] steps: - name: Checkout uses: actions/checkout@v3