diff --git a/docker-compose.yml b/docker-compose.yml index fb77a56..a7a5339 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3" services: pipeline-ui: build: "./pipeline-ui" diff --git a/pipeline-ui/backend/package.json b/pipeline-ui/backend/package.json index ff9c44a..ddf5939 100644 --- a/pipeline-ui/backend/package.json +++ b/pipeline-ui/backend/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "node ./build/index.js", - "dev": "cross-env NODE_ENV=DEV BACKEND_ENDPOINT=../../logstash/logstash-config/pipeline nodemon ./src/index.ts", + "dev": "cross-env NODE_ENV=DEV PIPELINE_DIRECTORY=../../logstash/logstash-config/pipeline nodemon ./src/index.ts", "lint": "eslint ./src/**/*.ts", "test": "echo \"Error: no test specified\" && exit 1", "build": "tsc" diff --git a/pipeline-ui/backend/src/api/v1/pipelines/getpipelines.ts b/pipeline-ui/backend/src/api/v1/pipelines/getpipelines.ts index 77993ba..eb59942 100644 --- a/pipeline-ui/backend/src/api/v1/pipelines/getpipelines.ts +++ b/pipeline-ui/backend/src/api/v1/pipelines/getpipelines.ts @@ -1,6 +1,6 @@ import path from 'path'; import fs from 'fs'; -import BACKEND_ENDPOINT from '../../../constants/BackendEndpoint'; +import PIPELINE_DIRECTORY from '../../../constants/PipelineDirectory'; export interface IPipeline { name: string, @@ -34,7 +34,7 @@ function fromDir(startPath: string, filter: string): string[] { // Get pipeline configs from the pipeline directory const getConfigFiles = () => { - const configFiles = fromDir(BACKEND_ENDPOINT, '.conf'); + const configFiles = fromDir(PIPELINE_DIRECTORY, '.conf'); const pipeLines: IPipeline[] = []; for (const configFilePath of configFiles) { diff --git a/pipeline-ui/backend/src/constants/BackendEndpoint.ts b/pipeline-ui/backend/src/constants/BackendEndpoint.ts deleted file mode 100644 index 21337f3..0000000 --- a/pipeline-ui/backend/src/constants/BackendEndpoint.ts +++ /dev/null @@ -1,2 +0,0 @@ -export default process.env.BACKEND_ENDPOINT || - '/usr/src/pipeline'; diff --git a/pipeline-ui/backend/src/constants/PipelineDirectory.ts b/pipeline-ui/backend/src/constants/PipelineDirectory.ts new file mode 100644 index 0000000..c9e7e8a --- /dev/null +++ b/pipeline-ui/backend/src/constants/PipelineDirectory.ts @@ -0,0 +1,2 @@ +export default process.env.PIPELINE_DIRECTORY || + '/usr/src/pipeline'; diff --git a/pipeline-ui/package-lock.json b/pipeline-ui/package-lock.json deleted file mode 100644 index f235e54..0000000 --- a/pipeline-ui/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "pipeline-ui", - "lockfileVersion": 3, - "requires": true, - "packages": {} -}