diff --git a/.prettierignore b/.prettierignore index 7e1eb12..a056ff6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -12,4 +12,4 @@ __pycache__/ htmlcov/ # Backend temporary files -backend/example/state +backend/.settings/state diff --git a/Taskfile.yaml b/Taskfile.yaml index 600b929..e69dd45 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -134,6 +134,7 @@ tasks: project_name='Github Watcher' project_slug='github-watcher' node_version='v21.5.0' + github_workflow_runs_on='ubuntu-latest' owner_name='Dmitry Ovsiannikov' owner_github_login='ovsds' scripts='true' diff --git a/backend/.gitignore b/backend/.gitignore index 73aaba0..6c80c89 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -11,4 +11,4 @@ __pycache__/ htmlcov/ # Local app state -example/state +.settings/state diff --git a/backend/example/config.yaml b/backend/.settings/config.yaml similarity index 100% rename from backend/example/config.yaml rename to backend/.settings/config.yaml diff --git a/backend/example/settings.yaml b/backend/.settings/dev.yaml similarity index 66% rename from backend/example/settings.yaml rename to backend/.settings/dev.yaml index 339cdaf..d7f3517 100644 --- a/backend/example/settings.yaml +++ b/backend/.settings/dev.yaml @@ -1,13 +1,14 @@ app: + env: development debug: true logs: level: DEBUG tasks: config_backend: type: yaml_file - path: example/config.yaml + path: .settings/config.yaml queue_backend: type: memory state_backend: type: local_dir - path: example/state + path: .settings/state diff --git a/backend/.settings/test.yaml b/backend/.settings/test.yaml new file mode 100644 index 0000000..e69de29 diff --git a/backend/Taskfile.yaml b/backend/Taskfile.yaml index f53a96f..dcf2def 100644 --- a/backend/Taskfile.yaml +++ b/backend/Taskfile.yaml @@ -12,9 +12,11 @@ vars: sh: find {{.SOURCE_FOLDERS}} -name '*.py' | tr '\n' ' ' DEFAULT_IMAGE_NAME: "github-watcher" + SETTINGS_FOLDER: "{{.TASKFILE_DIR}}/.settings" env: - GITHUB_WATCHER_SETTINGS_YAML: example/settings.yaml + GITHUB_WATCHER_SETTINGS_YAML: "{{.SETTINGS_FOLDER}}/dev.yaml" + GITHUB_WATCHER_SETTINGS_TEST_YAML: "{{.SETTINGS_FOLDER}}/test.yaml" tasks: _python: @@ -124,8 +126,9 @@ tasks: - echo 'Running image {{.TARGET}} target...' - docker run --env-file <( env| cut -f1 -d= ) - --env GITHUB_WATCHER_SETTINGS_YAML=example/settings.yaml - --volume $(pwd)/example:/opt/app/example + --volume {{.SETTINGS_FOLDER}}:/opt/app/.settings + --env GITHUB_WATCHER_SETTINGS_YAML="/opt/app/.settings/dev.yaml" + --env GITHUB_WATCHER_SETTINGS_TEST_YAML="/opt/app/.settings/test.yaml" {{.DEFAULT_IMAGE_NAME}}:{{.TARGET}} image-scan: @@ -223,7 +226,8 @@ tasks: - task: image-bake vars: { TARGET: runtime_dev } - task: image-run - vars: { TARGET: runtime } + vars: + TARGET: runtime update-from-template: desc: Update project from template