Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -25,6 +29,8 @@ RUN apk update \
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" \
&& chmod +x /usr/bin/gosu \
Expand Down
18 changes: 15 additions & 3 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -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" \
Expand All @@ -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 \
Expand All @@ -28,6 +38,8 @@ RUN apt-get clean \
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" \
&& chmod +x /usr/bin/gosu \
Expand All @@ -47,7 +59,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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```

1 change: 1 addition & 0 deletions requirements/v2.15/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ansible-core==2.15.3