Merge pull request #2534 from rsim/fix-devcontainer-yarn-gpg-key

Fix dev container: upgrade to Ruby 4.0.2 on Debian 13 (trixie) and add monthly CI

Author: yahonda

.devcontainer/Dockerfile

@@ -1,8 +1,15 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.4-bookworm
+FROM mcr.microsoft.com/devcontainers/base:trixie
 
-# Install libaio1 (required for Oracle Instant Client)
-RUN apt-get update && apt-get install -y libaio1 \
-    && rm -rf /var/lib/apt/lists/*
+# Install libaio1t64 and provide a libaio.so.1 symlink for Oracle Instant Client
+# Install rlwrap for readline support in sqlplus
+RUN rm -f /etc/apt/sources.list.d/yarn.list \
+    && apt-get update \
+    && apt-get install -y libaio1t64 rlwrap \
+    && rm -rf /var/lib/apt/lists/* \
+    && DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" \
+    && ln -sf /usr/lib/${DEB_HOST_MULTIARCH}/libaio.so.1t64 \
+              /usr/lib/${DEB_HOST_MULTIARCH}/libaio.so.1 \
+    && echo "alias sqlplus='rlwrap sqlplus'" >> /etc/bash.bashrc
 
 # Create directory structure for Oracle
 RUN mkdir -p /opt/oracle

.devcontainer/devcontainer.json

@@ -3,14 +3,20 @@
   "dockerComposeFile": "docker-compose.yml",
   "service": "app",
   "workspaceFolder": "/workspaces/oracle-enhanced",
+  "features": {
+    "ghcr.io/rails/devcontainer/features/ruby:2": {
+      "version": "4.0.2"
+    }
+  },
   "customizations": {
     "vscode": {
       "extensions": [
         "shopify.ruby-lsp"
       ]
     }
   },
-  "postCreateCommand": "bundle install",
+  "initializeCommand": "docker pull gvenzl/oracle-free:latest",
+  "postCreateCommand": "bash .devcontainer/postCreateCommand.sh",
   "remoteEnv": {
     "DATABASE_NAME": "FREEPDB1",
     "DATABASE_SYS_PASSWORD": "Oracle18",

.devcontainer/docker-compose.yml

@@ -22,7 +22,6 @@ services:
       retries: 10
     volumes:
       - oracle-data:/opt/oracle/oradata
-      - ../spec/support/create_oracle_enhanced_users.sql:/container-entrypoint-initdb.d/01-create-users.sql
 
 volumes:
   oracle-data:

.devcontainer/postCreateCommand.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+gem update --system
+bundle install
+
+echo "Waiting for Oracle to be ready..."
+oracle_ready=false
+for i in $(seq 1 30); do
+  if echo "exit" | sqlplus -s "system/${DATABASE_SYS_PASSWORD}@${DATABASE_NAME}" > /dev/null 2>&1; then
+    oracle_ready=true
+    break
+  fi
+  echo "Attempt $i/30 failed, retrying in 10s..."
+  sleep 10
+done
+if [ "$oracle_ready" != "true" ]; then
+  echo "Oracle did not become ready after 30 attempts; aborting container setup." >&2
+  exit 1
+fi
+
+ci/setup_accounts.sh
+
+echo "Dev container setup complete. You are ready to start developing the Oracle Enhanced adapter!"

.github/workflows/devcontainer.yml

@@ -0,0 +1,25 @@
+name: devcontainer
+
+on:
+  schedule:
+    - cron: "0 6 1 * *"  # 1st of every month at 6:00 AM UTC
+  workflow_dispatch:
+
+env:
+  RUBYOPT: "-w"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Boot dev container and run tests
+        uses: devcontainers/ci@v0.3
+        with:
+          runCmd: |
+            uname -a
+            lsb_release -a
+            ruby --version
+            bundle exec rake spec
+            bundle exec rubocop