-
Notifications
You must be signed in to change notification settings - Fork 62
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ДЗ-2 #56
Open
petryak-off
wants to merge
1
commit into
kzzzr:main
Choose a base branch
from
petryak-off:PetryakOFF
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
ДЗ-2 #56
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,53 @@ | ||
| // For format details, see https://aka.ms/devcontainer.json. For config options, see the | ||
| // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile | ||
| { | ||
| "name": "Existing Dockerfile", | ||
| "build": { | ||
| // Sets the run context to one level up instead of the .devcontainer folder. | ||
| // "context": "." | ||
| // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. | ||
| "dockerfile": "../Dockerfile" | ||
| }, | ||
|
|
||
| // Features to add to the dev container. More info: https://containers.dev/features. | ||
| // "features": {}, | ||
|
|
||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| "forwardPorts": [ | ||
| 8080 | ||
| ], | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "innoverio.vscode-dbt-power-user", | ||
| "ms-python.python", | ||
| "eamodio.gitlens", | ||
| "GitHub.vscode-pull-request-github", | ||
| "nemesv.copy-file-name" | ||
| ] | ||
| } | ||
| }, | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/common-utils:2": { | ||
| "installZsh": true, | ||
| "configureZshAsDefaultShell": true, | ||
| "installOhMyZsh": true, | ||
| "upgradePackages": true, | ||
| "username": "automatic", | ||
| "userUid": "automatic", | ||
| "userGid": "automatic" | ||
| }, | ||
| "ghcr.io/stuartleeks/dev-container-features/shell-history:0": {} | ||
| }, | ||
|
|
||
| // "runArgs": ["--env-file",".env"] | ||
|
|
||
| // Uncomment the next line to run commands after the container is created. | ||
| // "postCreateCommand": "cat /etc/os-release", | ||
|
|
||
| // Configure tool-specific properties. | ||
| // "customizations": {}, | ||
|
|
||
| // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. | ||
| // "remoteUser": "devcontainer" | ||
| } | ||
| // For format details, see https://aka.ms/devcontainer.json. For config options, see the | ||
| // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile | ||
| { | ||
| "name": "Existing Dockerfile", | ||
| "build": { | ||
| // Sets the run context to one level up instead of the .devcontainer folder. | ||
| // "context": "." | ||
| // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. | ||
| "dockerfile": "../Dockerfile" | ||
| }, | ||
| // Features to add to the dev container. More info: https://containers.dev/features. | ||
| // "features": {}, | ||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| "forwardPorts": [ | ||
| 8080 | ||
| ], | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "innoverio.vscode-dbt-power-user", | ||
| "ms-python.python", | ||
| "eamodio.gitlens", | ||
| "GitHub.vscode-pull-request-github", | ||
| "nemesv.copy-file-name" | ||
| ] | ||
| } | ||
| }, | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/common-utils:2": { | ||
| "installZsh": true, | ||
| "configureZshAsDefaultShell": true, | ||
| "installOhMyZsh": true, | ||
| "upgradePackages": true, | ||
| "username": "automatic", | ||
| "userUid": "automatic", | ||
| "userGid": "automatic" | ||
| }, | ||
| "ghcr.io/stuartleeks/dev-container-features/shell-history:0": {} | ||
| }, | ||
| // "runArgs": ["--env-file",".env"] | ||
| // Uncomment the next line to run commands after the container is created. | ||
| // "postCreateCommand": "cat /etc/os-release", | ||
| // Configure tool-specific properties. | ||
| // "customizations": {}, | ||
| // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. | ||
| // "remoteUser": "devcontainer" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| CLICKHOUSE_USER=admin | ||
| CLICKHOUSE_USER=admin | ||
| TF_VAR_clickhouse_password=clickhouse |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| name: Build and push image | ||
|
|
||
| on: | ||
| # pull_request: | ||
| # branches: [ main ] | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| REGISTRY: ghcr.io | ||
| IMAGE_NAME: ${{ github.repository }} | ||
|
|
||
| jobs: | ||
|
|
||
| build-and-push-image: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: Log in to the Container registry | ||
| uses: docker/login-action@v2 | ||
| with: | ||
| registry: ${{ env.REGISTRY }} | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Extract metadata (tags, labels) for Docker | ||
| id: meta | ||
| uses: docker/metadata-action@v4 | ||
| with: | ||
| images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} | ||
| - name: Build and push Docker image | ||
| uses: docker/build-push-action@v4 | ||
| with: | ||
| context: . | ||
| push: true | ||
| tags: ghcr.io/kzzzr/dbt_clickhouse_lab:ci | ||
| labels: ${{ steps.meta.outputs.labels }} | ||
| name: Build and push image | ||
| on: | ||
| # pull_request: | ||
| # branches: [ main ] | ||
| workflow_dispatch: | ||
| env: | ||
| REGISTRY: ghcr.io | ||
| IMAGE_NAME: ${{ github.repository }} | ||
| jobs: | ||
| build-and-push-image: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| - name: Log in to the Container registry | ||
| uses: docker/login-action@v2 | ||
| with: | ||
| registry: ${{ env.REGISTRY }} | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Extract metadata (tags, labels) for Docker | ||
| id: meta | ||
| uses: docker/metadata-action@v4 | ||
| with: | ||
| images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} | ||
| - name: Build and push Docker image | ||
| uses: docker/build-push-action@v4 | ||
| with: | ||
| context: . | ||
| push: true | ||
| tags: ghcr.io/kzzzr/dbt_clickhouse_lab:ci | ||
| labels: ${{ steps.meta.outputs.labels }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| name: Continuous Integration Tests | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: [ main ] | ||
| concurrency: | ||
| group: ${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
|
|
||
| ci_test: | ||
| name: Clickhouse CI | ||
| timeout-minutes: 5 | ||
| runs-on: ubuntu-latest | ||
| services: | ||
| clickhouse: | ||
| image: clickhouse/clickhouse-server:23.3 | ||
| ports: | ||
| - 9000:9000 | ||
| - 8123:8123 | ||
| container: | ||
| image: ghcr.io/kzzzr/dbt_clickhouse_lab:ci | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - run: dbt --version | ||
| - run: dbt debug --target ci | ||
| - run: dbt deps --target ci | ||
| - run: dbt run-operation init_s3_sources --target ci | ||
| - run: dbt build --target ci | ||
| name: Continuous Integration Tests | ||
| on: | ||
| pull_request: | ||
| branches: [ main ] | ||
| concurrency: | ||
| group: ${{ github.ref }} | ||
| cancel-in-progress: true | ||
| jobs: | ||
| ci_test: | ||
| name: Clickhouse CI | ||
| timeout-minutes: 5 | ||
| runs-on: ubuntu-latest | ||
| services: | ||
| clickhouse: | ||
| image: clickhouse/clickhouse-server:23.3 | ||
| ports: | ||
| - 9000:9000 | ||
| - 8123:8123 | ||
| container: | ||
| image: ghcr.io/kzzzr/dbt_clickhouse_lab:ci | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - run: dbt --version | ||
| - run: dbt debug --target ci | ||
| - run: dbt deps --target ci | ||
| - run: dbt run-operation init_s3_sources --target ci | ||
| - run: dbt build --target ci |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,44 @@ | ||
| target/ | ||
| dbt_packages/ | ||
| logs/ | ||
|
|
||
| .env | ||
|
|
||
| # Local .terraform directories | ||
| **/.terraform/* | ||
|
|
||
| # .tfstate files | ||
| *.tfstate | ||
| *.tfstate.* | ||
|
|
||
| # Crash log files | ||
| crash.log | ||
| crash.*.log | ||
|
|
||
| # Exclude all .tfvars files, which are likely to contain sensitive data, such as | ||
| # password, private keys, and other secrets. These should not be part of version | ||
| # control as they are data points which are potentially sensitive and subject | ||
| # to change depending on the environment. | ||
| *.tfvars | ||
| *.tfvars.json | ||
|
|
||
| # Ignore override files as they are usually used to override resources locally and so | ||
| # are not checked in | ||
| override.tf | ||
| override.tf.json | ||
| *_override.tf | ||
| *_override.tf.json | ||
|
|
||
| # Include override files you do wish to add to version control using negated pattern | ||
| # !example_override.tf | ||
|
|
||
| # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan | ||
| # example: *tfplan* | ||
|
|
||
| # Ignore CLI configuration files | ||
| .terraformrc | ||
| terraform.rc | ||
|
|
||
| .terraform.lock.hcl | ||
|
|
||
| target/ | ||
| dbt_packages/ | ||
| logs/ | ||
| .env | ||
| # Local .terraform directories | ||
| **/.terraform/* | ||
| # .tfstate files | ||
| *.tfstate | ||
| *.tfstate.* | ||
| # Crash log files | ||
| crash.log | ||
| crash.*.log | ||
| # Exclude all .tfvars files, which are likely to contain sensitive data, such as | ||
| # password, private keys, and other secrets. These should not be part of version | ||
| # control as they are data points which are potentially sensitive and subject | ||
| # to change depending on the environment. | ||
| *.tfvars | ||
| *.tfvars.json | ||
| # Ignore override files as they are usually used to override resources locally and so | ||
| # are not checked in | ||
| override.tf | ||
| override.tf.json | ||
| *_override.tf | ||
| *_override.tf.json | ||
| # Include override files you do wish to add to version control using negated pattern | ||
| # !example_override.tf | ||
| # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan | ||
| # example: *tfplan* | ||
| # Ignore CLI configuration files | ||
| .terraformrc | ||
| terraform.rc | ||
| .terraform.lock.hcl | ||
| .DS_Store |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
файлы не поменялись, единственное - изменились окончания строк CR/LF