From d64787efc5b76c4478165da6611449b60e4107a8 Mon Sep 17 00:00:00 2001 From: Doug Lagemann <douglagemann@seed-innovations.com> Date: Tue, 12 Nov 2024 12:26:00 -0700 Subject: [PATCH] whole lotta changes to start using move file features --- {config => db-updates}/postgres-entrypoint.sh | 0 .../Dockerfile.node-be.dev | 0 .../Dockerfile.node-vite-ui.dev | 0 {root => docs}/readme-golang.md | 0 formulas/api/express.yml | 4 ++++ formulas/baselines/node.yml | 4 ++++ formulas/baselines/universal.yml | 12 +++++++++++ formulas/db/postgres.yml | 21 ++++++++----------- formulas/ui/react.yml | 4 ++++ formulas/ui/vuetify3.yml | 4 ++++ 10 files changed, 37 insertions(+), 12 deletions(-) rename {config => db-updates}/postgres-entrypoint.sh (100%) rename root/Dockerfile.be.dev => docker/Dockerfile.node-be.dev (100%) rename root/Dockerfile.ui.dev => docker/Dockerfile.node-vite-ui.dev (100%) rename {root => docs}/readme-golang.md (100%) diff --git a/config/postgres-entrypoint.sh b/db-updates/postgres-entrypoint.sh similarity index 100% rename from config/postgres-entrypoint.sh rename to db-updates/postgres-entrypoint.sh diff --git a/root/Dockerfile.be.dev b/docker/Dockerfile.node-be.dev similarity index 100% rename from root/Dockerfile.be.dev rename to docker/Dockerfile.node-be.dev diff --git a/root/Dockerfile.ui.dev b/docker/Dockerfile.node-vite-ui.dev similarity index 100% rename from root/Dockerfile.ui.dev rename to docker/Dockerfile.node-vite-ui.dev diff --git a/root/readme-golang.md b/docs/readme-golang.md similarity index 100% rename from root/readme-golang.md rename to docs/readme-golang.md diff --git a/formulas/api/express.yml b/formulas/api/express.yml index 93e390c..d20fc58 100644 --- a/formulas/api/express.yml +++ b/formulas/api/express.yml @@ -6,3 +6,7 @@ service: pipeline: substitutions: subProject: -api + +getLocalDevFiles: + - from: docker/Dockerfile.node-be.dev + to: Dockerfile.be.dev \ No newline at end of file diff --git a/formulas/baselines/node.yml b/formulas/baselines/node.yml index 529ad31..eb4af42 100644 --- a/formulas/baselines/node.yml +++ b/formulas/baselines/node.yml @@ -6,3 +6,7 @@ pipeline: pipelineJobs: npm-lint: composeFile: docker/pipeline-jobs/docker-compose-npm-lint.yml + +getLocalDevDirs: + - from: scripts/npm-lint + to: scripts/npm-lint diff --git a/formulas/baselines/universal.yml b/formulas/baselines/universal.yml index 234dcab..702ac99 100644 --- a/formulas/baselines/universal.yml +++ b/formulas/baselines/universal.yml @@ -5,3 +5,15 @@ pipeline: pipelineJobs: trufflehog: composeFile: docker/pipeline-jobs/docker-compose-trufflehog.yml + +getLocalDevDirs: + - from: root + to: / + - from: config + to: config + - from: scripts/trufflehog + to: scripts/trufflehog + +getLocalDevFiles: + - from: scripts/setup.sh + to: scripts/setup.sh \ No newline at end of file diff --git a/formulas/db/postgres.yml b/formulas/db/postgres.yml index 693c947..e37f613 100644 --- a/formulas/db/postgres.yml +++ b/formulas/db/postgres.yml @@ -6,20 +6,17 @@ service: dbPassword: PG_PASSWORD dbHost: PG_HOST -getDirs: - - from: config/ - to: src/config-test - - from: scripts/npm-lint - to: test_scripts/ - - from: scripts/trufflehog/ - to: test_scripts/ +getLocalDevFiles: + - from: db-updates/postgres-entrypoint.sh + to: config/postgres-entrypoint.sh -getFiles: +getProjectDirs: + - from: db-updates/node/postgres/migrations + to: src/data/migrations + +getProjectFiles: - from: db-updates/node/postgres/dataLayer.js to: src/data/dataLayer.js - - from: db-updates/node/postgres/migrations/202411060900_create-version-table.sql - to: src/data/migrations/202411060900_create-version-table.sql - -mergeFiles: - from: db-updates/node/postgres/package.json to: package.json + merge: true diff --git a/formulas/ui/react.yml b/formulas/ui/react.yml index 6d686ef..2c7af24 100644 --- a/formulas/ui/react.yml +++ b/formulas/ui/react.yml @@ -6,3 +6,7 @@ service: pipeline: substitutions: subProject: -ui + +getLocalDevFiles: + - from: docker/Dockerfile.node-vite-ui.dev + to: Dockerfile.ui.dev \ No newline at end of file diff --git a/formulas/ui/vuetify3.yml b/formulas/ui/vuetify3.yml index 6d686ef..5a6e012 100644 --- a/formulas/ui/vuetify3.yml +++ b/formulas/ui/vuetify3.yml @@ -6,3 +6,7 @@ service: pipeline: substitutions: subProject: -ui + +getLocalDevFiles: + - from: docker/Dockerfile.node-vite-ui.dev + to: Dockerfile.ui.dev -- GitLab