1024

Author: 7908837174

.devcontainer/Dockerfile

@@ -2,6 +2,9 @@ FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+# Create a non-root user
+RUN useradd -m -s /bin/bash vscode
+
 WORKDIR /workspace
 
 RUN export DEBIAN_FRONTEND=noninteractive
@@ -15,6 +18,7 @@ RUN \
     clang-format \
     clang-tidy \
     cmake \
+    curl \
     ditaa \
     g++ \
     gcc-riscv64-linux-gnu \
@@ -38,8 +42,13 @@ RUN \
     ruby-dev \
     shellcheck
 
+# Fix PEP 668 issue by using --break-system-packages flag
+RUN pip3 install --break-system-packages -r /workspace/requirements.txt
+
 RUN apt-get clean autoclean
 RUN apt-get autoremove -y
 RUN rm -rf /var/lib/{apt,dpkg,cache,log}/*
 
-WORKDIR /workspace
+# Switch to non-root user
+USER vscode
+WORKDIR /home/vscode

.devcontainer/onCreateCommand.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
 
 npm i
-bundle install
+bundle install --verbose
+
+# Install Python packages with --break-system-packages flag to avoid PEP 668 error
+pip3 install --break-system-packages -r requirements.txt

.devcontainer/updateContentCommand.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
-bundle
+bundle install --verbose
+
+# Install Python packages with --break-system-packages flag to avoid PEP 668 error
+pip3 install --break-system-packages -r requirements.txt

.github/workflows/container-tests.yml

@@ -0,0 +1,45 @@
+name: Container Tests
+
+on:
+  pull_request:
+    paths:
+      - '.devcontainer/**'
+      - 'docker-compose.yml'
+      - 'start-dev.sh'
+      - 'tests/**'
+  push:
+    branches:
+      - main
+    paths:
+      - '.devcontainer/**'
+      - 'docker-compose.yml'
+      - 'start-dev.sh'
+      - 'tests/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        proxy: ['with-proxy', 'no-proxy']
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up test environment
+        run: |
+          if [ "${{ matrix.proxy }}" = "with-proxy" ]; then
+            echo "Setting up test proxy"
+            export http_proxy="http://localhost:3128"
+            export https_proxy="http://localhost:3128"
+            docker run -d --name squid-proxy -p 3128:3128 ubuntu/squid
+          fi
+
+      - name: Run container tests
+        run: |
+          chmod +x tests/container_tests.sh
+          ./tests/container_tests.sh
+
+      - name: Test VS Code integration
+        run: |
+          # Skip this test for now as it's not essential for the build
+          echo "Skipping VS Code integration test"

Gemfile

@@ -8,7 +8,10 @@ gem "idl_highlighter", path: "tools/ruby-gems/idl_highlighter"
 gem "udb_helpers", path: "tools/ruby-gems/udb_helpers"
 gem "udb", path: "tools/ruby-gems/udb"
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
+
+gem 'bundler'
+gem 'rake'
 
 # gem "activesupport"
 gem "asciidoctor-diagram", "~> 2.2"

tests/container_tests.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: BSD-2-Clause
+# SPDX-FileCopyrightText: Copyright (c) 2025 RISC-V International
+
+# Container tests script for riscv-unified-db
+
+set -e
+
+echo "Running container tests..."
+
+# Test 1: Check if we can build the container
+echo "Test 1: Building container..."
+docker build -t riscv-unified-db-test .devcontainer/
+
+# Test 2: Check if we can run basic commands in the container
+echo "Test 2: Running basic commands in container..."
+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 4: Check if we can install gems
+echo "Test 4: 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..."
+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..."
+docker run --rm riscv-unified-db-test id -u vscode
+
+# Test 7: Proxy configuration test
+echo "Test 7: 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
+    docker run --rm -e http_proxy -e https_proxy riscv-unified-db-test env | grep -i proxy
+else
+    echo "No proxy configured"
+fi
+
+echo "All container tests passed!"