1024

Author: 7908837174

.devcontainer/Dockerfile

@@ -42,8 +42,10 @@ RUN \
     ruby-dev \
     shellcheck
 
-# Fix PEP 668 issue by using --break-system-packages flag
-RUN pip3 install --break-system-packages -r /workspace/requirements.txt
+# Create a virtual environment and install Python requirements
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+RUN pip install -r /workspace/requirements.txt
 
 RUN apt-get clean autoclean
 RUN apt-get autoremove -y

.devcontainer/onCreateCommand.sh

@@ -3,5 +3,7 @@
 npm i
 bundle install --verbose
 
-# Install Python packages with --break-system-packages flag to avoid PEP 668 error
-pip3 install --break-system-packages -r requirements.txt
+# Create a virtual environment and install Python requirements
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements.txt

.devcontainer/updateContentCommand.sh

@@ -2,5 +2,7 @@
 
 bundle install --verbose
 
-# Install Python packages with --break-system-packages flag to avoid PEP 668 error
-pip3 install --break-system-packages -r requirements.txt
+# Create a virtual environment and install Python requirements
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements.txt

tests/container_tests.sh

@@ -19,24 +19,28 @@ docker run --rm riscv-unified-db-test ruby --version
 docker run --rm riscv-unified-db-test python3 --version
 docker run --rm riscv-unified-db-test npm --version
 
-# Test 3: Check if we can install Python packages
-echo "Test 3: Installing Python packages..."
-docker run --rm -v $(pwd):/workspace riscv-unified-db-test pip3 install --break-system-packages -r /workspace/requirements.txt
+# Test 3: Check if we can install Python packages in a virtual environment
+echo "Test 3: Installing Python packages in virtual environment..."
+docker run --rm -v $(pwd):/workspace riscv-unified-db-test bash -c "cd /workspace && python3 -m venv .venv && source .venv/bin/activate && pip install -r requirements.txt"
 
-# Test 4: Check if we can install gems
-echo "Test 4: Installing gems..."
+# Test 4: Check if we can install Python packages with --break-system-packages flag
+echo "Test 4: Installing Python packages with --break-system-packages flag..."
+docker run --rm -v $(pwd):/workspace riscv-unified-db-test bash -c "cd /workspace && pip3 install --break-system-packages -r requirements.txt"
+
+# Test 5: Check if we can install gems
+echo "Test 5: Installing gems..."
 docker run --rm riscv-unified-db-test gem list bundler
 
-# Test 5: Check if we can run rake tasks
-echo "Test 5: Running rake tasks..."
+# Test 6: Check if we can run rake tasks
+echo "Test 6: Running rake tasks..."
 docker run --rm -v $(pwd):/workspace riscv-unified-db-test rake --version
 
-# Test 6: Check non-root user exists
-echo "Test 6: Checking non-root user..."
+# Test 7: Check non-root user exists
+echo "Test 7: Checking non-root user..."
 docker run --rm riscv-unified-db-test id -u vscode
 
-# Test 7: Proxy configuration test
-echo "Test 7: Checking proxy configuration..."
+# Test 8: Proxy configuration test
+echo "Test 8: Checking proxy configuration..."
 if [ -n "$http_proxy" ] || [ -n "$https_proxy" ]; then
     echo "Proxy is configured: HTTP_PROXY=$http_proxy, HTTPS_PROXY=$https_proxy"
     # Test proxy connectivity if configured
@@ -45,4 +49,4 @@ else
     echo "No proxy configured"
 fi
 
-echo "All container tests passed!"
+echo "All container tests passed!"