Skip to content

Commit 8ac703a

Browse files
Merge pull request #1146 from microsoft/dev
fix: Dev to main PR
2 parents 050224e + 08233f9 commit 8ac703a

27 files changed

Lines changed: 1388 additions & 1277 deletions

.devcontainer/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
FROM mcr.microsoft.com/devcontainers/python:3.11-bullseye
22

3+
# Route npm/corepack traffic (used during devcontainer feature installation,
4+
# e.g. ghcr.io/devcontainers/features/node) through the internal package feed
5+
# proxy, since the public npmjs.org registry is blocked/unreachable on this
6+
# network and causes feature install failures (ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE).
7+
ENV NPM_CONFIG_REGISTRY=https://packagefeedproxy.microsoft.io/npm/
8+
39
# Remove Yarn repository to avoid GPG key expiration issue
410
RUN rm -f /etc/apt/sources.list.d/yarn.list

.devcontainer/devcontainer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"features": {
77
"ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
88
"ghcr.io/azure/azure-dev/azd:latest": {},
9-
"ghcr.io/devcontainers/features/node:1": {},
9+
"ghcr.io/devcontainers/features/node:1": {"pnpmVersion": "none"},
1010
"ghcr.io/devcontainers/features/azure-cli:1": {
1111
"installBicep": true,
1212
"version": "latest",
@@ -46,7 +46,10 @@
4646
"DISPLAY": "dummy",
4747
"PYTHONUNBUFFERED": "True",
4848
"UV_LINK_MODE": "copy",
49-
"UV_PROJECT_ENVIRONMENT": "/home/vscode/.venv"
49+
"UV_PROJECT_ENVIRONMENT": "/home/vscode/.venv",
50+
"PIP_INDEX_URL": "https://packagefeedproxy.microsoft.io/pypi/simple/",
51+
"UV_INDEX_URL": "https://packagefeedproxy.microsoft.io/pypi/simple/",
52+
"NPM_CONFIG_REGISTRY": "https://packagefeedproxy.microsoft.io/npm/"
5053
},
5154
"remoteUser": "vscode",
5255
"hostRequirements": {

.devcontainer/setupEnv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88

99
echo "Setting up Backend..."
1010
cd ./src/backend
11-
uv sync --frozen --extra dev
11+
uv sync --frozen
1212
cd ../../
1313

1414
echo "Setting up Frontend..."

.github/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
12
fastapi==0.136.1
23
uvicorn==0.35.0
34
azure-cosmos==4.15.0

.github/workflows/pylint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626

2727
- name: Install dependencies
2828
run: |
29-
python -m pip install --upgrade pip
29+
python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
3030
pip install -r .github/requirements.txt
31-
pip install flake8 # Ensure flake8 is installed explicitly
31+
pip install --index-url https://packagefeedproxy.microsoft.io/pypi/simple/ flake8 # Ensure flake8 is installed explicitly
3232
3333
- name: Run flake8 and pylint
3434
run: |

.github/workflows/test-automation-v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Install dependencies
6161
run: |
62-
python -m pip install --upgrade pip
62+
python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
6363
pip install -r tests/e2e-test/requirements.txt
6464
6565
- name: Ensure browsers are installed

.github/workflows/test-automation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Install dependencies
6565
run: |
66-
python -m pip install --upgrade pip
66+
python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
6767
pip install -r tests/e2e-test/requirements.txt
6868
6969
- name: Ensure browsers are installed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Install dependencies
5757
run: |
58-
python -m pip install --upgrade pip
58+
python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
5959
pip install -r .github/requirements.txt
6060
6161
- name: Check if test files exist

infra/scripts/post-provision/post_deploy.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ resource_group=""
1616
user_principal_id=""
1717
ai_foundry_resource_id=""
1818
python_cmd=""
19-
venv_path="$SCRIPT_DIR/scriptenv"
19+
# Dev container bind-mounts cause OSError on large packages; use $HOME Path instead.
20+
if [ -n "${REMOTE_CONTAINERS:-}" ] || [ -n "${CODESPACES:-}" ] || [ -f "/run/.containerenv" ] || grep -qF "microsoft.com/devcontainers" /etc/os-release 2>/dev/null; then
21+
venv_path="$HOME/.macae-post-provision-env"
22+
else
23+
venv_path="$SCRIPT_DIR/scriptenv"
24+
fi
2025

2126
st_is_public_access_disabled=false
2227
srch_is_public_access_disabled=false

infra/scripts/post-provision/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
12
azure-search-documents==11.5.3
23
azure-identity==1.24.0
34
azure-storage-blob==12.26.0

0 commit comments

Comments
 (0)