From 54079f82237ed9e179db8284b08be03902991660 Mon Sep 17 00:00:00 2001 From: NilashishC Date: Tue, 30 Apr 2024 19:01:19 +0530 Subject: [PATCH 1/2] Rename to ansible-workspace-env-reference Signed-off-by: NilashishC --- .github/actions/build-release/action.yml | 2 +- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- Containerfile | 2 +- README.md | 8 ++++++++ playbooks/ansible-navigator.yml | 6 +++--- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/actions/build-release/action.yml b/.github/actions/build-release/action.yml index 129d623..dee78b4 100644 --- a/.github/actions/build-release/action.yml +++ b/.github/actions/build-release/action.yml @@ -11,7 +11,7 @@ inputs: default: ansible final_image: description: Name of the final image. - default: community-ansible-devspaces + default: ansible-workspace-env-reference publish: description: Publish the image to ghcr.io default: "false" diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e46a0de..16f3929 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -24,6 +24,6 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build the container image - uses: ansible/community-ansible-devspaces-image/.github/actions/build-release@main + uses: ansible/ansible-workspace-env-reference-image/.github/actions/build-release@main with: publish: 'true' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e5da52..483247d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,4 +23,4 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build the container image - uses: ansible/community-ansible-devspaces-image/.github/actions/build-release@main + uses: ansible/ansible-workspace-env-reference-image/.github/actions/build-release@main diff --git a/Containerfile b/Containerfile index 390d412..759bfdd 100644 --- a/Containerfile +++ b/Containerfile @@ -2,7 +2,7 @@ FROM quay.io/devfile/universal-developer-image:ubi8-latest ARG PYV=3.11 -LABEL org.opencontainers.image.source https://github.com/ansible/community-ansible-devspaces-image +LABEL org.opencontainers.image.source https://github.com/ansible/ansible-workspace-env-reference-image LABEL org.opencontainers.image.authors "Ansible DevTools" LABEL org.opencontainers.image.vendor "Red Hat" LABEL org.opencontainers.image.licenses "GPL-3.0" diff --git a/README.md b/README.md index d4af06c..60722a2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ +<<<<<<< Updated upstream [![cd](https://github.com/ansible/community-ansible-devspaces-image/actions/workflows/cd.yml/badge.svg?branch=main&event=schedule)](https://github.com/ansible/community-ansible-devspaces-image/actions/workflows/cd.yml) # Community Ansible Dev Spaces Image +======= +# Ansible Workspace Environment Reference Image for Openshift Devspaces +>>>>>>> Stashed changes An OpenShift Dev Spaces image specifically for Ansible development. @@ -10,7 +14,11 @@ For documentation on how to use these tools, please refer to [ADT docs](https:// This image is built and published on a nightly basis. Grab this image using: ```bash +<<<<<<< Updated upstream podman pull ghcr.io/ansible/community-ansible-devspaces:latest +======= +podman pull ghcr.io/ansible/ansible-workspace-env-reference:latest +>>>>>>> Stashed changes ``` ## Base Image diff --git a/playbooks/ansible-navigator.yml b/playbooks/ansible-navigator.yml index 6e3d925..6bc7068 100644 --- a/playbooks/ansible-navigator.yml +++ b/playbooks/ansible-navigator.yml @@ -2,15 +2,15 @@ ansible-navigator: logging: level: debug - append: False + append: false file: $PWD/.logs/ansible-navigator.log execution-environment: enabled: true - image: ghcr.io/ansible/community-ansible-dev-tools-container:latest + image: ghcr.io/ansible/community-ansible-dev-tools:latest pull: policy: always playbook-artifact: - enable: True + enable: true save-as: "$PWD/.logs/{playbook_name}-artifact-{time_stamp}.json" From d1c1d7b3690ef4fdb9dfb653a55cd16c6f2edfba Mon Sep 17 00:00:00 2001 From: NilashishC Date: Tue, 30 Apr 2024 19:03:54 +0530 Subject: [PATCH 2/2] Fix README Signed-off-by: NilashishC --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index 60722a2..5b1a90f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,4 @@ -<<<<<<< Updated upstream -[![cd](https://github.com/ansible/community-ansible-devspaces-image/actions/workflows/cd.yml/badge.svg?branch=main&event=schedule)](https://github.com/ansible/community-ansible-devspaces-image/actions/workflows/cd.yml) - -# Community Ansible Dev Spaces Image -======= # Ansible Workspace Environment Reference Image for Openshift Devspaces ->>>>>>> Stashed changes An OpenShift Dev Spaces image specifically for Ansible development. @@ -14,11 +8,7 @@ For documentation on how to use these tools, please refer to [ADT docs](https:// This image is built and published on a nightly basis. Grab this image using: ```bash -<<<<<<< Updated upstream -podman pull ghcr.io/ansible/community-ansible-devspaces:latest -======= podman pull ghcr.io/ansible/ansible-workspace-env-reference:latest ->>>>>>> Stashed changes ``` ## Base Image