Skip to content

Commit

Permalink
Unify yaml extension
Browse files Browse the repository at this point in the history
  • Loading branch information
Tansito committed Aug 29, 2023
1 parent dcd2435 commit a9dd8f2
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ INSTALL.md
README.md
/vendor
Dockerfile
docker-compose.yml
docker-compose-dev.yml
docker-compose.yaml
docker-compose-dev.yaml

### IDEs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:
default: aquasec/trivy:0.42.1
required: false
GITHUB_TOKEN:
description: GitHub token passed as input to be used in action.yml # https://github.com/orgs/community/discussions/27054#discussioncomment-3254450
description: GitHub token passed as input to be used in action.yaml # https://github.com/orgs/community/discussions/27054#discussioncomment-3254450
required: true
dockerfile:
description: Dockerfile to build the image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ runs:
shell: bash
id: list-changed
run: |
changed=$(ct list-changed --config ct.yml)
changed=$(ct list-changed --config ct.yaml)
if [[ -n "$changed" ]]; then
echo "changed=true" >> "$GITHUB_OUTPUT"
fi
- name: Run chart-testing (lint)
shell: bash
if: steps.list-changed.outputs.changed == 'true'
run: ct lint --config ct.yml --check-version-increment=false
run: ct lint --config ct.yaml --check-version-increment=false

# - name: Create kind cluster
# if: steps.list-changed.outputs.changed == 'true'
Expand All @@ -40,4 +40,4 @@ runs:
# - name: Run chart-testing (install)
# shell: bash
# if: steps.list-changed.outputs.changed == 'true'
# run: ct install --config ct.yml
# run: ct install --config ct.yaml
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Build the containers
run: docker compose -f docker-compose-dev.yml --profile jupyter build
run: docker compose -f docker-compose-dev.yaml --profile jupyter build
- name: Run the jupyter profile
run: docker compose -f docker-compose-dev.yml --profile jupyter up -d
run: docker compose -f docker-compose-dev.yaml --profile jupyter up -d
- name: Give containers time to initialize
shell: bash
run: sleep 90
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "Dockerfile-ray-node"
- "gateway/Dockerfile"
- "repository/Dockerfile"
- ".github/actions/docker-vscan/action.yml"
- ".github/actions/docker-vscan/action.yaml"
- ".github/scripts/dockerfile-security.rego"
- ".github/workflows/docker-verify.yaml"

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Helm verify process
on:
push:
paths:
- "ct.yml"
- "ct.yaml"
- "charts/*"
- ".github/actions/helm-lint/action.yml"
- ".github/workflows/helm-verify.yml"
- ".github/actions/helm-lint/action.yaml"
- ".github/workflows/helm-verify.yaml"

jobs:
lint:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ To set up a local development environment for the quantum-serverless components

To build the images, run the following command from the root directory:

```docker compose -f docker-compose-dev.yml build```
```docker compose -f docker-compose-dev.yaml build```

And to deploy your code, run the following command:

```docker compose -f docker-compose-dev.yml up```
```docker compose -f docker-compose-dev.yaml up```

If you wish to rebuild only a specific component (for example, the `gateway`), you can do so as follows:

```docker compose -f docker-compose-dev.yml build gateway```
```docker compose -f docker-compose-dev.yaml build gateway```

For Apple Silicon system (arm64 / aarch64), set `TARGETARCH=arm64` before running the `docker compose` command.

Expand Down
2 changes: 1 addition & 1 deletion client/tests/core/test_program.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_program():
"""Integration test for program."""

with DockerCompose(
resources_path, compose_file_name="test-compose.yml", pull=True
resources_path, compose_file_name="test-compose.yaml", pull=True
) as compose:
host = compose.get_service_host("testrayhead", 8265)
port = compose.get_service_port("testrayhead", 8265)
Expand Down
2 changes: 1 addition & 1 deletion client/tests/core/test_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_state():
"""Integration test for jobs."""

with DockerCompose(
resources_path, compose_file_name="test-compose.yml", pull=True
resources_path, compose_file_name="test-compose.yaml", pull=True
) as compose:
host = compose.get_service_host("testrayhead", 8265)
port = compose.get_service_port("testrayhead", 8265)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml → docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ services:
profiles: [ "full" ]
volumes:
- /var/log:/var/log
command: -config.file=/etc/promtail/config.yml
command: -config.file=/etc/promtail/config.yaml
networks:
- safe-tier
grafana:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml → docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ services:
profiles: [ "full" ]
volumes:
- /var/log:/var/log
command: -config.file=/etc/promtail/config.yml
command: -config.file=/etc/promtail/config.yaml
networks:
- safe-tier
grafana:
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/cloud.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ In case you want to use the ``main`` branch you can use the configuration for de
.. code-block::
:caption: run the command from the root of the project
$ docker compose -f docker-compose-dev.yml --profile jupyter up
$ docker compose -f docker-compose-dev.yaml --profile jupyter up
.. _helm-deployment:

Expand Down

0 comments on commit a9dd8f2

Please sign in to comment.