fix CI

Author: danielecalda

.github/workflows/docker-build-push.yml

@@ -49,6 +49,6 @@ jobs:
               id: docker_build_parser
               uses: docker/build-push-action@v2
               with:
-                file: email-parser/Dockerfile
+                file: database-parser/python/Dockerfile
                 push: true
                 tags: smclab/openk9-database-parser:${{ steps.prep.outputs.version }}

.gitlab/.gitlab-ci.yml

@@ -16,7 +16,7 @@ Build Tagged Parser Docker Images:
   before_script:
     - docker login -u $CI_REGISTRY_USERNAME -p $CI_REGISTRY_PASSWORD $CI_REGISTRY_NAME
   script:
-    - docker build -t database-parser:${CI_COMMIT_REF_NAME} -f database-parser/Dockerfile .
+    - docker build -t database-parser:${CI_COMMIT_REF_NAME} -f database-parser/python/Dockerfile .
     - docker tag database-parser:${CI_COMMIT_REF_NAME} $CI_REGISTRY_NAME/openk9/database-parser:${CI_COMMIT_REF_NAME}
     - docker push $CI_REGISTRY_NAME/openk9/database-parser:${CI_COMMIT_REF_NAME}
 
@@ -37,6 +37,6 @@ Build Latest Parser Docker Images:
   before_script:
     - docker login -u $CI_REGISTRY_USERNAME -p $CI_REGISTRY_PASSWORD $CI_REGISTRY_NAME
   script:
-    - docker build -t database-parser:latest -f database-parser/Dockerfile .
+    - docker build -t database-parser:latest -f database-parser/python/Dockerfile .
     - docker tag database-parser:latest $CI_REGISTRY_NAME/openk9/database-parser:latest
     - docker push $CI_REGISTRY_NAME/openk9/database-parser:latest

database-parser/java/app/build.gradle

@@ -12,7 +12,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.gitlab4j:gitlab4j-api:5.0.1'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'

…onnector/ConnectorGitlabApplication.java …nector/ConnectorDatabaseApplication.javadatabase-parser/java/app/src/main/java/com/smc/connector/ConnectorGitlabApplication.java renamed to database-parser/java/app/src/main/java/com/smc/connector/ConnectorDatabaseApplication.java database-parser/java/app/src/main/java/com/smc/connector/ConnectorGitlabApplication.java renamed to database-parser/java/app/src/main/java/com/smc/connector/ConnectorDatabaseApplication.java

@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class ConnectorGitlabApplication {
+public class ConnectorDatabaseApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(ConnectorGitlabApplication.class, args);

database-parser/python/app/main.py

@@ -12,10 +12,6 @@
 if ingestion_url is None:
     ingestion_url = "http://ingestion:8080/v1/ingestion/"
 
-delete_url = os.environ.get("DELETE_URL")
-if delete_url is None:
-    delete_url = "http://index-writer:8080/v1/delete-data-documents"
-
 logger = logging.getLogger("uvicorn.access")
 
 

docker-compose.yml

@@ -4,8 +4,7 @@ services:
         image: database-parser:latest
         container_name: database-parser
         environment:
-            INGESTION_URL: " http://ingestion:8080/v1/ingestion/"
-            DELETE_URL: "http://ingestion:8080/v1/ingestion/"
+            INGESTION_URL: " http://ingestion:8080/api/ingestion/v1/ingestion/"
         ports:
             - "5000:5000"
     postgres: