feat: move to services (#474)

gregkonush · Oct 11, 2024 · 5f0c5d1 · 5f0c5d1
1 parent 44428f8
commit 5f0c5d1
Show file tree

Hide file tree

Showing 117 changed files with 355 additions and 467 deletions.
diff --git a/.github/workflows/docker-build-push.yaml b/.github/workflows/docker-build-push.yaml
@@ -5,8 +5,8 @@ on:
     branches:
       - "main"
     paths:
-      - "packages/ecran/**"
-      - "packages/java-executor/**"
+      - "services/ecran/**"
+      - "services/java-executor/**"
 
 jobs:
   version:
@@ -36,8 +36,8 @@ jobs:
     uses: ./.github/workflows/docker-build-common.yaml
     with:
       image_name: ecran
-      dockerfile: ./packages/ecran/Dockerfile
-      context: ./packages/ecran
+      dockerfile: ./services/ecran/Dockerfile
+      context: ./services/ecran
       new_tag: ${{ needs.version.outputs.new_tag }}
     secrets:
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
@@ -48,8 +48,8 @@ jobs:
     uses: ./.github/workflows/docker-build-common.yaml
     with:
       image_name: ecran-worker
-      dockerfile: ./packages/ecran/Dockerfile.worker
-      context: ./packages/ecran
+      dockerfile: ./services/ecran/Dockerfile.worker
+      context: ./services/ecran
       new_tag: ${{ needs.version.outputs.new_tag }}
     secrets:
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
@@ -60,8 +60,8 @@ jobs:
     uses: ./.github/workflows/docker-build-common.yaml
     with:
       image_name: ecran-migrator
-      dockerfile: ./packages/ecran/Dockerfile.migrator
-      context: ./packages/ecran
+      dockerfile: ./services/ecran/Dockerfile.migrator
+      context: ./services/ecran
       new_tag: ${{ needs.version.outputs.new_tag }}
     secrets:
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
@@ -72,8 +72,8 @@ jobs:
     uses: ./.github/workflows/docker-build-common.yaml
     with:
       image_name: java-executor
-      dockerfile: ./packages/java-executor/Dockerfile
-      context: ./packages/java-executor
+      dockerfile: ./services/java-executor/Dockerfile
+      context: ./services/java-executor
       new_tag: ${{ needs.version.outputs.new_tag }}
     secrets:
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}

diff --git a/README.md b/README.md
@@ -109,28 +109,10 @@ Install with poetry for package management with pipx
 pipx install poetry
 ```
 
-#### Devtools
-
-Autocomplete
-
-```bash
-brew install --cask codewhisperer
-```
+### Devtools
 
 Github
 
 ```bash
 brew install gh
 ```
-
-Install pre-commit
-
-```bash
-brew install pre-commit
-```
-
-Install pre-commit hooks
-
-```bash
-pre-commit install
-```
diff --git a/next.config.js b/next.config.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "k:install": "./kubernetes/install.sh",
     "k:config": "cp kubeconfig ~/.kube/kubeconfig",
     "k:bootstrap": "helm template argocd bootstrap/argo-cd --namespace argocd | kubectl apply -f -",
-    "ecran:dev": "bun run --cwd packages/ecran dev",
+    "ecran:dev": "bun run --cwd services/ecran dev",
     "prepare": "husky"
   },
   "packageManager": "[email protected]",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,2 +1,2 @@
 packages:
-  - "packages/*"
+  - "services/*"
diff --git a/poetry.lock b/poetry.lock
diff --git a/scripts/build-ecran-migrator.sh b/scripts/build-ecran-migrator.sh
@@ -2,8 +2,8 @@
 
 # Set variables
 IMAGE_NAME="kalmyk.duckdns.org/lab/ecran-migrator"
-DOCKERFILE="packages/ecran/Dockerfile.migrator"
-CONTEXT_PATH="packages/ecran"
+DOCKERFILE="services/ecran/Dockerfile.migrator"
+CONTEXT_PATH="services/ecran"
 
 # Check if a tag is provided as an argument
 if [ $# -eq 1 ]; then

diff --git a/scripts/build-ecran-worker.sh b/scripts/build-ecran-worker.sh
@@ -2,8 +2,8 @@
 
 # Set variables
 IMAGE_NAME="kalmyk.duckdns.org/lab/ecran-worker"
-DOCKERFILE="packages/ecran/Dockerfile.worker"
-CONTEXT_PATH="packages/ecran"
+DOCKERFILE="services/ecran/Dockerfile.worker"
+CONTEXT_PATH="services/ecran"
 
 # Check if a tag is provided as an argument
 if [ $# -eq 1 ]; then

diff --git a/scripts/build-ecran.sh b/scripts/build-ecran.sh
@@ -2,8 +2,8 @@
 
 # Set variables
 IMAGE_NAME="kalmyk.duckdns.org/lab/ecran"
-DOCKERFILE="packages/ecran/Dockerfile"
-CONTEXT_PATH="packages/ecran"
+DOCKERFILE="services/ecran/Dockerfile"
+CONTEXT_PATH="services/ecran"
 
 # Check if a tag is provided as an argument
 if [ $# -eq 1 ]; then

diff --git a/scripts/build-java-executor.sh b/scripts/build-java-executor.sh
@@ -2,8 +2,8 @@
 
 # Set variables
 IMAGE_NAME="kalmyk.duckdns.org/lab/java-executor"
-DOCKERFILE="packages/java-executor/Dockerfile"
-CONTEXT_PATH="packages/java-executor"
+DOCKERFILE="services/java-executor/Dockerfile"
+CONTEXT_PATH="services/java-executor"
 
 # Check if a tag is provided as an argument
 if [ $# -eq 1 ]; then

diff --git a/packages/ecran/.dockerignore → services/ecran/.dockerignore b/packages/ecran/.dockerignore → services/ecran/.dockerignore
diff --git a/packages/ecran/.eslintrc.json → services/ecran/.eslintrc.json b/packages/ecran/.eslintrc.json → services/ecran/.eslintrc.json
diff --git a/packages/ecran/.gitignore → services/ecran/.gitignore b/packages/ecran/.gitignore → services/ecran/.gitignore
diff --git a/packages/ecran/.prettierrc → services/ecran/.prettierrc b/packages/ecran/.prettierrc → services/ecran/.prettierrc
diff --git a/packages/ecran/Dockerfile → services/ecran/Dockerfile b/packages/ecran/Dockerfile → services/ecran/Dockerfile
diff --git a/packages/ecran/Dockerfile.migrator → services/ecran/Dockerfile.migrator b/packages/ecran/Dockerfile.migrator → services/ecran/Dockerfile.migrator
diff --git a/packages/ecran/Dockerfile.worker → services/ecran/Dockerfile.worker b/packages/ecran/Dockerfile.worker → services/ecran/Dockerfile.worker
diff --git a/packages/ecran/README.md → services/ecran/README.md b/packages/ecran/README.md → services/ecran/README.md
diff --git a/packages/ecran/components.json → services/ecran/components.json b/packages/ecran/components.json → services/ecran/components.json