From 2f8547942d03b9e6ec141b6fc4f1fcee6b209ed0 Mon Sep 17 00:00:00 2001
From: Petr Ankudinov <petr.ankudinov@gmail.com>
Date: Wed, 3 Jan 2024 08:40:41 +0100
Subject: [PATCH] Feat: rename avd-containers to containers (#3461)

---
 .github/workflows/container_build_base.yml                      | 2 +-
 .github/workflows/container_build_dev.yml                       | 2 +-
 .github/workflows/container_build_template.yml                  | 2 +-
 .github/workflows/container_build_universal.yml                 | 2 +-
 {avd-containers => containers}/base/.devcontainer/Dockerfile    | 0
 .../base/.devcontainer/devcontainer.json                        | 0
 {avd-containers => containers}/base/.devcontainer/entrypoint.sh | 0
 {avd-containers => containers}/dev/.devcontainer/Dockerfile     | 0
 .../dev/.devcontainer/devcontainer.json                         | 0
 {avd-containers => containers}/dev/.devcontainer/entrypoint.sh  | 0
 .../universal/.devcontainer/Dockerfile                          | 0
 .../universal/.devcontainer/devcontainer.json                   | 0
 12 files changed, 4 insertions(+), 4 deletions(-)
 rename {avd-containers => containers}/base/.devcontainer/Dockerfile (100%)
 rename {avd-containers => containers}/base/.devcontainer/devcontainer.json (100%)
 rename {avd-containers => containers}/base/.devcontainer/entrypoint.sh (100%)
 rename {avd-containers => containers}/dev/.devcontainer/Dockerfile (100%)
 rename {avd-containers => containers}/dev/.devcontainer/devcontainer.json (100%)
 rename {avd-containers => containers}/dev/.devcontainer/entrypoint.sh (100%)
 rename {avd-containers => containers}/universal/.devcontainer/Dockerfile (100%)
 rename {avd-containers => containers}/universal/.devcontainer/devcontainer.json (100%)

diff --git a/.github/workflows/container_build_base.yml b/.github/workflows/container_build_base.yml
index ec179eb8f8a..5592e72a120 100644
--- a/.github/workflows/container_build_base.yml
+++ b/.github/workflows/container_build_base.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - devel
     paths:
-      - avd-containers/base/**
+      - containers/base/**
       - .github/workflows/container_build_template.yml
       - .github/workflows/container_build_base.yml
   workflow_dispatch:
diff --git a/.github/workflows/container_build_dev.yml b/.github/workflows/container_build_dev.yml
index 07ea2d0ca7c..2db05bb4f19 100644
--- a/.github/workflows/container_build_dev.yml
+++ b/.github/workflows/container_build_dev.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - devel
     paths:
-      - avd-containers/dev/**
+      - containers/dev/**
       - .github/workflows/container_build_template.yml
       - .github/workflows/container_build_dev.yml
   workflow_dispatch:
diff --git a/.github/workflows/container_build_template.yml b/.github/workflows/container_build_template.yml
index 7d11a70e12b..017872f4965 100644
--- a/.github/workflows/container_build_template.yml
+++ b/.github/workflows/container_build_template.yml
@@ -182,7 +182,7 @@ jobs:
           UID: ${{ inputs.user_id }}
           GID: ${{ inputs.group_id }}
         with:
-          subFolder: avd-containers/${{ inputs.container_name }}
+          subFolder: containers/${{ inputs.container_name }}
           imageName: ghcr.io/${{ github.repository }}/${{ inputs.container_name }}
           imageTag: ${{ steps.build-tags.outputs.image_tags }}
           platform: ${{ inputs.platform }}
diff --git a/.github/workflows/container_build_universal.yml b/.github/workflows/container_build_universal.yml
index b01fba5c057..5d7adaa80a1 100644
--- a/.github/workflows/container_build_universal.yml
+++ b/.github/workflows/container_build_universal.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - devel
     paths:
-      - avd-containers/universal/**
+      - containers/universal/**
       - .github/workflows/container_build_template.yml
       - .github/workflows/container_build_universal.yml
   workflow_dispatch:
diff --git a/avd-containers/base/.devcontainer/Dockerfile b/containers/base/.devcontainer/Dockerfile
similarity index 100%
rename from avd-containers/base/.devcontainer/Dockerfile
rename to containers/base/.devcontainer/Dockerfile
diff --git a/avd-containers/base/.devcontainer/devcontainer.json b/containers/base/.devcontainer/devcontainer.json
similarity index 100%
rename from avd-containers/base/.devcontainer/devcontainer.json
rename to containers/base/.devcontainer/devcontainer.json
diff --git a/avd-containers/base/.devcontainer/entrypoint.sh b/containers/base/.devcontainer/entrypoint.sh
similarity index 100%
rename from avd-containers/base/.devcontainer/entrypoint.sh
rename to containers/base/.devcontainer/entrypoint.sh
diff --git a/avd-containers/dev/.devcontainer/Dockerfile b/containers/dev/.devcontainer/Dockerfile
similarity index 100%
rename from avd-containers/dev/.devcontainer/Dockerfile
rename to containers/dev/.devcontainer/Dockerfile
diff --git a/avd-containers/dev/.devcontainer/devcontainer.json b/containers/dev/.devcontainer/devcontainer.json
similarity index 100%
rename from avd-containers/dev/.devcontainer/devcontainer.json
rename to containers/dev/.devcontainer/devcontainer.json
diff --git a/avd-containers/dev/.devcontainer/entrypoint.sh b/containers/dev/.devcontainer/entrypoint.sh
similarity index 100%
rename from avd-containers/dev/.devcontainer/entrypoint.sh
rename to containers/dev/.devcontainer/entrypoint.sh
diff --git a/avd-containers/universal/.devcontainer/Dockerfile b/containers/universal/.devcontainer/Dockerfile
similarity index 100%
rename from avd-containers/universal/.devcontainer/Dockerfile
rename to containers/universal/.devcontainer/Dockerfile
diff --git a/avd-containers/universal/.devcontainer/devcontainer.json b/containers/universal/.devcontainer/devcontainer.json
similarity index 100%
rename from avd-containers/universal/.devcontainer/devcontainer.json
rename to containers/universal/.devcontainer/devcontainer.json