add more replacements

arista-netdevops-community · May 3, 2024 · 84006c7 · 84006c7
1 parent c1750af
commit 84006c7
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/...iecutter.__demo_slug}}/.devcontainer/{{cookiecutter.__demo_slug}}/devcontainer.json.jinja b/...iecutter.__demo_slug}}/.devcontainer/{{cookiecutter.__demo_slug}}/devcontainer.json.jinja
@@ -6,7 +6,8 @@
 {%- if cookiecutter.cv_api_token_required %}
         "CV_API_TOKEN": "${localEnv:CV_API_TOKEN}",
 {%- endif %}
-        "CONTAINERWSF": "${containerWorkspaceFolder}"
+        "CONTAINERWSF": "${containerWorkspaceFolder}",
+        "GITHUB_REPOSITORY": "${localEnv:GITHUB_REPOSITORY}"
     {% raw %}},{% endraw %}
     "secrets": {% raw %}{{% endraw %}
 {%- if cookiecutter.cv_api_token_required %}

diff --git a/.devcontainer/avd-avd-extended-workshop--part-1/devcontainer.json b/.devcontainer/avd-avd-extended-workshop--part-1/devcontainer.json
@@ -3,7 +3,8 @@
     // containerEnv set the variables applied to entire container
     "containerEnv": {
         "ARISTA_TOKEN": "${localEnv:ARTOKEN}",
-        "CONTAINERWSF": "${containerWorkspaceFolder}"
+        "CONTAINERWSF": "${containerWorkspaceFolder}",
+        "GITHUB_REPOSITORY": "${localEnv:GITHUB_REPOSITORY}"
     },
     "secrets": {
         "ARTOKEN": {

diff --git a/.devcontainer/avd-extended-workshop-part-1/devcontainer.json b/.devcontainer/avd-extended-workshop-part-1/devcontainer.json
@@ -3,7 +3,8 @@
     // containerEnv set the variables applied to entire container
     "containerEnv": {
         "ARISTA_TOKEN": "${localEnv:ARTOKEN}",
-        "CONTAINERWSF": "${containerWorkspaceFolder}"
+        "CONTAINERWSF": "${containerWorkspaceFolder}",
+        "GITHUB_REPOSITORY": "${localEnv:GITHUB_REPOSITORY}"
     },
     "secrets": {
         "ARTOKEN": {

diff --git a/.devcontainer/clab-build-containerlab-with-ceos/devcontainer.json b/.devcontainer/clab-build-containerlab-with-ceos/devcontainer.json
@@ -3,7 +3,8 @@
     // containerEnv set the variables applied to entire container
     "containerEnv": {
         "ARISTA_TOKEN": "${localEnv:ARTOKEN}",
-        "CONTAINERWSF": "${containerWorkspaceFolder}"
+        "CONTAINERWSF": "${containerWorkspaceFolder}",
+        "GITHUB_REPOSITORY": "${localEnv:GITHUB_REPOSITORY}"
     },
     "secrets": {
         "ARTOKEN": {

diff --git a/.devcontainer/cvaas-cvaas-and-avd-demo--evpn-aa/devcontainer.json b/.devcontainer/cvaas-cvaas-and-avd-demo--evpn-aa/devcontainer.json
@@ -4,7 +4,8 @@
     "containerEnv": {
         "ARISTA_TOKEN": "${localEnv:ARTOKEN}",
         "CV_API_TOKEN": "${localEnv:CV_API_TOKEN}",
-        "CONTAINERWSF": "${containerWorkspaceFolder}"
+        "CONTAINERWSF": "${containerWorkspaceFolder}",
+        "GITHUB_REPOSITORY": "${localEnv:GITHUB_REPOSITORY}"
     },
     "secrets": {
         "CV_API_TOKEN": {

diff --git a/.devcontainer/cvaas-cvaas-and-avd-demo--evpn-mlag/devcontainer.json b/.devcontainer/cvaas-cvaas-and-avd-demo--evpn-mlag/devcontainer.json
@@ -4,7 +4,8 @@
     "containerEnv": {
         "ARISTA_TOKEN": "${localEnv:ARTOKEN}",
         "CV_API_TOKEN": "${localEnv:CV_API_TOKEN}",
-        "CONTAINERWSF": "${containerWorkspaceFolder}"
+        "CONTAINERWSF": "${containerWorkspaceFolder}",
+        "GITHUB_REPOSITORY": "${localEnv:GITHUB_REPOSITORY}"
     },
     "secrets": {
         "CV_API_TOKEN": {

diff --git a/.github/workflows/publish-pages.yml b/.github/workflows/publish-pages.yml
@@ -36,6 +36,7 @@ jobs:
           grep -rl 'https://github.com/.*/one-click-se-demos' . --exclude-dir .git | xargs sed -i 's/https:\/\/github.com\/.*\/one-click-se-demos/https:\/\/github.com\/'"${{ github.repository_owner }}"'\/one-click-se-demos/g'
           grep -rl '{{gh.repo_name}}' . --exclude-dir .git | xargs sed -i 's/{{gh.repo_name}}/'"${{ github.repository_owner }}"'/g'
           grep -rl '{{gh.org_name}}' . --exclude-dir .git | xargs sed -i 's/{{gh.org_name}}/'"${{ github.repository_owner }}"'/g'
+          grep -rl '{{gh.repository}}' . --exclude-dir .git | xargs sed -i 's@{{gh.org_name}}@'"${{ github.repository }}"'@g'
 
       - name: Setup Python3 🐍
         uses: actions/setup-python@v5

diff --git a/containers/clab-build-containerlab-with-ceos/.devcontainer/postCreate.sh b/containers/clab-build-containerlab-with-ceos/.devcontainer/postCreate.sh
@@ -4,6 +4,13 @@ set +e
 
 ardl get eos --image-type cEOS --version ${CEOS_LAB_VERSION}  --import-docker
 
+# replace all markdown vars in demo directory
+grep -rl 'https://.*.github.io/one-click-se-demos/' . --exclude-dir .git | xargs sed -i 's/https:\/\/.*.github.io\/one-click-se-demos/https:\/\/'"${GITHUB_REPOSITORY%%/*}"'.github.io\/one-click-se-demos/g'
+grep -rl 'https://github.com/.*/one-click-se-demos' . --exclude-dir .git | xargs sed -i 's/https:\/\/github.com\/.*\/one-click-se-demos/https:\/\/github.com\/'"${GITHUB_REPOSITORY%%/*}"'\/one-click-se-demos/g'
+grep -rl '{{gh.repo_name}}' . --exclude-dir .git | xargs sed -i 's/{{gh.repo_name}}/'"${GITHUB_REPOSITORY##*/}"'/g'
+grep -rl '{{gh.org_name}}' . --exclude-dir .git | xargs sed -i 's/{{gh.org_name}}/'"${GITHUB_REPOSITORY%%/*}"'/g'
+grep -rl '{{gh.repository}}' . --exclude-dir .git | xargs sed -i 's@{{gh.org_name}}@'"${GITHUB_REPOSITORY}"'@g'
+
 # init demo dir as Git repo if requested for this demo env
 if ${GIT_INIT}; then
   cd ${CONTAINERWSF}