Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d281c75

Browse files
lingdielingdie
authored
fix acr image name and python entrypoint (#52)
1 parent f8c0cbc commit d281c75

File tree

13 files changed

+168
-20
lines changed

13 files changed

+168
-20
lines changed

‎.github/actions/generate-image-names/action.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ runs:
5959
if [ "$aliyun_credentials" != "{}" ] && [ "$aliyun_credentials" != "" ] && [ "$aliyun_credentials" != "null" ]; then
6060
# Parse Aliyun credentials
6161
registry=$(echo "$aliyun_credentials" | jq -r '.registry')
62-
acr_image_name="${registry}/${{ fromJson(inputs.aliyun_credentials).username }}/devbox/${image_name}:${tag}"
62+
namespace=$(echo "$aliyun_credentials" | jq -r '.namespace')
63+
acr_image_name="${registry}/${namespace}/devbox/${image_name}:${tag}"
6364
else
6465
acr_image_name=""
6566
fi

‎.github/workflows/build-framework-runtimes.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ jobs:
114114
dockerfile: ${{ matrix.framework_packages.dockerfile }}
115115
tag: ${{ needs.define-matrix.outputs.tag }}
116116
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
117-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
117+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
118118
- name: Build and push standard images (standard)
119119
uses: ./.github/actions/build-and-push
120120
with:
121121
dockerfile: ${{ matrix.framework_packages.dockerfile }}
122122
build_base_image: ${{ matrix.framework_packages.base_image }}
123123
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
124124
ghcr_image_name: ${{ steps.generate-standard.outputs.ghcr_image_name }}
125-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
125+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
126126
acr_image_name: ${{ steps.generate-standard.outputs.acr_image_name }}
127127
- name: Generate image names (cn-patched)
128128
id: generate-cn
@@ -132,7 +132,7 @@ jobs:
132132
dockerfile: ${{ matrix.framework_packages.dockerfile }}
133133
tag: ${{ needs.define-matrix.outputs.tag_cn }}
134134
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
135-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
135+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
136136
- name: Build and push cn-patched images (cn-patched)
137137
if: ${{ needs.define-matrix.outputs.cn_patch_enabled == 'true' }}
138138
uses: ./.github/actions/build-and-push
@@ -141,6 +141,6 @@ jobs:
141141
build_base_image: ${{ matrix.framework_packages.base_image_with_cn_patch }}
142142
build_args: CN_PATCH_ENABLED=true
143143
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
144-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
144+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
145145
ghcr_image_name: ${{ steps.generate-cn.outputs.ghcr_image_name }}
146146
acr_image_name: ${{ steps.generate-cn.outputs.acr_image_name }}

‎.github/workflows/build-language-runtimes.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ jobs:
113113
dockerfile: ${{ matrix.language_packages }}
114114
tag: ${{ needs.define-matrix.outputs.tag }}
115115
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
116-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
116+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
117117
- name: Build and push standard images (standard)
118118
uses: ./.github/actions/build-and-push
119119
with:
120120
dockerfile: ${{ matrix.language_packages }}
121121
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
122122
ghcr_image_name: ${{ steps.generate-standard.outputs.ghcr_image_name }}
123-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
123+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
124124
acr_image_name: ${{ steps.generate-standard.outputs.acr_image_name }}
125125
build_base_image: ${{ needs.define-matrix.outputs.build_base_image }}
126126
- name: Generate image names (cn-patched)
@@ -131,7 +131,7 @@ jobs:
131131
dockerfile: ${{ matrix.language_packages }}
132132
tag: ${{ needs.define-matrix.outputs.tag_cn }}
133133
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
134-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
134+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
135135
- name: Build and push cn-patched images (cn-patched)
136136
if: ${{ needs.define-matrix.outputs.cn_patch_enabled == 'true' }}
137137
uses: ./.github/actions/build-and-push
@@ -140,6 +140,6 @@ jobs:
140140
build_args: CN_PATCH_ENABLED=true
141141
build_base_image: ${{ needs.define-matrix.outputs.build_base_image_with_cn_patch }}
142142
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
143-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
143+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
144144
ghcr_image_name: ${{ steps.generate-cn.outputs.ghcr_image_name }}
145145
acr_image_name: ${{ steps.generate-cn.outputs.acr_image_name }}

‎.github/workflows/build-os-runtimes.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ jobs:
8585
dockerfile: ${{ matrix.os_packages }}
8686
tag: ${{ needs.define-matrix.outputs.tag }}
8787
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
88-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
88+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
8989
- name: Build and push standard images
9090
uses: ./.github/actions/build-and-push
9191
with:
9292
dockerfile: ${{ matrix.os_packages }}
9393
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
9494
ghcr_image_name: ${{ steps.generate-standard.outputs.ghcr_image_name }}
95-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
95+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
9696
acr_image_name: ${{ steps.generate-standard.outputs.acr_image_name }}
9797
- name: Generate image names (cn-patched)
9898
id: generate-cn
@@ -102,7 +102,7 @@ jobs:
102102
dockerfile: ${{ matrix.os_packages }}
103103
tag: ${{ needs.define-matrix.outputs.tag_cn }}
104104
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
105-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
105+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}
106106
- name: Build and push cn-patched images
107107
if: ${{ needs.define-matrix.outputs.cn_patch_enabled == 'true' }}
108108
uses: ./.github/actions/build-and-push
@@ -112,4 +112,4 @@ jobs:
112112
ghcr_image_name: ${{ steps.generate-cn.outputs.ghcr_image_name }}
113113
ghcr_credentials: ${{ format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', 'ghcr.io', github.repository_owner, secrets.GITHUB_TOKEN) || '{}' }}
114114
acr_image_name: ${{ steps.generate-cn.outputs.acr_image_name }}
115-
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD) || '{}' }}
115+
aliyun_credentials: ${{ inputs.aliyun_enabled == 'true' && format('{{"registry":"{0}","username":"{1}","password":"{2}", "namespace":"{3}"}}', secrets.ALIYUN_REGISTRY, secrets.ALIYUN_USERNAME, secrets.ALIYUN_PASSWORD, secrets.ALIYUN_NAMESPACE) || '{}' }}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ bin
99
*.log
1010

1111
# IDE 文件
12-
.vscode/
1312
.idea/
1413
*.swp
1514
*.swo

‎runtimes/frameworks/django/4.2.16/project/.vscode/setting.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"python.defaultInterpreterPath": "./venv/bin/python",
3+
"python.terminal.activateEnvironment": true,
4+
"terminal.integrated.env.linux": {
5+
"VIRTUAL_ENV": "${workspaceFolder}/venv"
6+
},
7+
"terminal.integrated.profiles.linux": {
8+
"Python Venv": {
9+
"path": "/bin/bash",
10+
"args": ["-c", "source ${workspaceFolder}/bin/activate && exec bash"]
11+
}
12+
},
13+
"terminal.integrated.defaultProfile.linux": "Python Venv"
14+
}

‎runtimes/frameworks/flask/3.0.3/project/.vscode/setting.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"python.defaultInterpreterPath": "./venv/bin/python",
3+
"python.terminal.activateEnvironment": true,
4+
"terminal.integrated.env.linux": {
5+
"VIRTUAL_ENV": "${workspaceFolder}/venv"
6+
},
7+
"terminal.integrated.profiles.linux": {
8+
"Python Venv": {
9+
"path": "/bin/bash",
10+
"args": ["-c", "source ${workspaceFolder}/bin/activate && exec bash"]
11+
}
12+
},
13+
"terminal.integrated.defaultProfile.linux": "Python Venv"
14+
}

‎runtimes/languages/python/3.10/project/.vscode/setting.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"python.defaultInterpreterPath": "./venv/bin/python",
3+
"python.terminal.activateEnvironment": true,
4+
"terminal.integrated.env.linux": {
5+
"VIRTUAL_ENV": "${workspaceFolder}/venv"
6+
},
7+
"terminal.integrated.profiles.linux": {
8+
"Python Venv": {
9+
"path": "/bin/bash",
10+
"args": ["-c", "source ${workspaceFolder}/bin/activate && exec bash"]
11+
}
12+
},
13+
"terminal.integrated.defaultProfile.linux": "Python Venv"
14+
}

‎runtimes/languages/python/3.10/project/entrypoint.sh‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
11
#!/bin/bash
2-
. bin/activate
3-
python3 hello.py
2+
3+
app_env=${1:-development}
4+
5+
# Prefer activating Python virtual environment if present
6+
if [ -f "bin/activate" ]; then
7+
. bin/activate
8+
fi
9+
10+
# Development environment commands
11+
dev_commands() {
12+
echo "Running development environment commands..."
13+
python3 hello.py
14+
}
15+
16+
# Production environment commands
17+
prod_commands() {
18+
echo "Running production environment commands..."
19+
python3 hello.py
20+
}
21+
22+
# Decide environment based on argument
23+
if [ "$app_env" = "production" ] || [ "$app_env" = "prod" ] ; then
24+
echo "Production environment detected"
25+
prod_commands
26+
else
27+
echo "Development environment detected"
28+
dev_commands
29+
fi

‎runtimes/languages/python/3.11/project/.vscode/setting.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"python.defaultInterpreterPath": "./venv/bin/python",
3+
"python.terminal.activateEnvironment": true,
4+
"terminal.integrated.env.linux": {
5+
"VIRTUAL_ENV": "${workspaceFolder}/venv"
6+
},
7+
"terminal.integrated.profiles.linux": {
8+
"Python Venv": {
9+
"path": "/bin/bash",
10+
"args": ["-c", "source ${workspaceFolder}/bin/activate && exec bash"]
11+
}
12+
},
13+
"terminal.integrated.defaultProfile.linux": "Python Venv"
14+
}

0 commit comments

Comments
 (0)