Merge pull request #37 from infn-datacloud/jenkins

Jenkins and devcontainer

Author: giosava94

.devcontainer/devcontainer.json

@@ -30,8 +30,8 @@
           "editor.defaultFormatter": "ms-azuretools.vscode-docker"
         },
         "sonarlint.connectedMode.project": {
-          "connectionId": "indigo-paas/federation-registry",
-          "projectKey": "indigo-paas_federation-registry"
+          "connectionId": "infn-datacloud/federation-registry",
+          "projectKey": "infn-datacloud_federation-registry"
         },
         "python.analysis.autoFormatStrings": true,
         "python.analysis.inlayHints.functionReturnTypes": true,
@@ -46,24 +46,24 @@
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
-    "ghcr.io/devcontainers-contrib/features/act:1": {},
     "ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
     "ghcr.io/devcontainers-contrib/features/ruff:1": {},
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
     "ghcr.io/devcontainers/features/git:1": {},
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/devcontainers/features/python:1": {
-      "installTools": true,
-      "version": "3.9"
+      "installTools": false,
+      "version": "3.10"
     },
-    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {},
+    "ghcr.io/devcontainers/features/node:1": {}
   },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postStartCommand": "bash .devcontainer/postCreateCommand.sh"
+  "postStartCommand": "bash .devcontainer/postStartCommand.sh"
 
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
   // "remoteUser": "root"

.devcontainer/docker-compose.yml

@@ -1,48 +1,28 @@
-version: "3"
-
 services:
   db:
-    image: neo4j:5.15
+    image: neo4j:5.18
     container_name: fed-reg-devc-db
+    ports:
+      - 7687:7687
+      - 7474:7474
     volumes:
       - fed-reg-devc-db-data:/data
       - fed-reg-devc-db-logs:/logs
     environment:
       - NEO4J_AUTH=none
       - NEO4J_PLUGINS=["apoc"]
-    networks:
-      - fed-reg-devc-db
-
-  oidc-agent:
-    image: opensciencegrid/oidc-agent:3.6-release-20240220-1639
-    container_name: fed-reg-devc-oidc-agent
-    platform: linux/amd64
-    volumes:
-      - fed-reg-devc-oidc-agent-iss-config:/root/.oidc-agent
-    networks:
-      - fed-reg-devc-oidc-agent
 
   base:
-    image: mcr.microsoft.com/devcontainers/typescript-node:18
+    build:
+      context: ./..
+      dockerfile: ./dockerfiles/Dockerfile.devc
     container_name: fed-reg-devc-base
-    depends_on:
-      - db
-      - oidc-agent
     volumes:
       - ..:/workspace:cached
     environment:
       - NEO4J_SERVER=fed-reg-devc-db
-      - OIDC_AGENT_CONTAINER_NAME=fed-reg-devc-oidc-agent
-    networks:
-      - fed-reg-devc-db
-      - fed-reg-devc-oidc-agent
     command: sleep infinity
 
 volumes:
   fed-reg-devc-db-data:
   fed-reg-devc-db-logs:
-  fed-reg-devc-oidc-agent-iss-config:
-
-networks:
-  fed-reg-devc-db:
-  fed-reg-devc-oidc-agent:

.devcontainer/postCreateCommand.sh

@@ -0,0 +1,2 @@
+# Install poetry dependencies
+poetry install

.devcontainer/postStartCommand.sh

@@ -0,0 +1,9 @@
+services:
+  backend:
+    image: indigopaas/federation-registry:v1.0.0-alpha.2
+    restart: unless-stopped
+    ports:
+      - "8000:80"
+    environment:
+      - ADMIN_EMAIL_LIST=${ADMIN_EMAIL_LIST}
+      - TRUSTED_IDP_LIST=${TRUSTED_IDP_LIST}

.github/workflows/docker-build.yaml

@@ -0,0 +1,8 @@
+services:
+  backend:
+    depends_on:
+      db:
+        condition: service_healthy
+        required: false
+    environment:
+      - NEO4J_SERVER=db