New Docker Image

.github/workflows/Quality_Assessment_&_Awarding_v1.yml

@@ -1,13 +1,8 @@
 name: Quality_Assessment_&_Awarding_v1
 
 on:
-  push:
-    branches:
-      - sqa
-  pull_request:
-    branches:
-      - sqa
-
+  workflow_dispatch:
+
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/Quality_Assessment_&_Awarding_v2.yml

@@ -1,12 +1,7 @@
 name: Quality_Assessment_&_Awarding_v2
 
 on:
-  push:
-    branches:
-      - sqa
-  pull_request:
-    branches:
-      - sqa
+  workflow_dispatch:
 
 jobs:
   QAA:

Dockerfile

@@ -1,17 +1,24 @@
-FROM python:3-alpine
+FROM python:3.9-slim
 
-WORKDIR /app
+# Install dependencies
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    docker.io \
+    docker-compose
 
-RUN python -m pip install --upgrade pip
+# Work Directory
+WORKDIR /app
 
-COPY requirements.txt .
+# Clean and clone updated GitHub repo
+RUN rm -rf /app/* && \
+    git clone --branch sqa https://github.com/HPCI-Lab/yProv.git .
 
+# Install requirements
+COPY requirements.txt /app/requirements.txt
 RUN pip install -r requirements.txt
 
-COPY . .
-
-ENV PORT=3000 SCHEME="bolt" ADDRESS='db:7687'
-
-EXPOSE 3000
-
-CMD [ "python" , "./app.py" ]
+# Make the script_dockerfile.sh script executable and run it
+COPY script_dockerfile.sh /app/script_dockerfile.sh 
+RUN chmod +x /app/script_dockerfile.sh
+ENTRYPOINT ["/app/script_dockerfile.sh"]

SQAaaS/test_auth.py

@@ -1,10 +1,10 @@
 import requests
 import test_documents
 
-PATH = "http://localhost:3000/api/v0/auth"
+#PATH = "http://localhost:3000/api/v0/auth"
 
 # path to use to create a docker image
-# PATH = "http://web:3000/api/v0/auth"
+PATH = "http://web:3000/api/v0/auth"
 
 
 

SQAaaS/test_documents.py

@@ -1,9 +1,9 @@
 import requests
 
-PATH = "http://localhost:3000/api/v0/documents"
+#PATH = "http://localhost:3000/api/v0/documents"
 
 # path to use to create a docker image
-#PATH = "http://web:3000/api/v0/documents"
+PATH = "http://web:3000/api/v0/documents"
 
 
 TOKEN = None

requirements.txt

@@ -1,7 +1,2 @@
-Flask==2.3.1
-prov==2.0.0
-prov2neo[dev]
-py2neo==2021.2.4
-PyJWT==2.8.0
-bcrypt==4.1.2
-passlib==1.7.4
+pytest
+requests

SQAaaS/script_dockerfile.sh → script_dockerfile.sh

@@ -49,7 +49,11 @@ docker run \
   --env PASSWORD=password \
   hpci/yprov:latest
 
-docker network connect yprov_net unittests
+# Get the current container's hostname (which is the container's ID)
+CONTAINER_ID=$(cat /etc/hostname)
+
+# Connect the current container to the yprov_net network
+docker network connect yprov_net "$CONTAINER_ID"
 
 # Try to connect to Neo4j
 echo "Connection to Neo4j"