Skip to content

Commit

Permalink
Merge pull request #33 from canonical/proxy-settings-update
Browse files Browse the repository at this point in the history
Proxy settings update
  • Loading branch information
matthew-hagemann authored Oct 2, 2024
2 parents 747f1cf + f8754d2 commit fbacf92
Show file tree
Hide file tree
Showing 9 changed files with 154 additions and 2,642 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install dependencies
run: python3 -m pip install tox
run: python3 -m pip install tox --break-system-packages tox
- name: Run linters
run: |
tox -e lint
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install dependencies
run: python -m pip install tox
run: python -m pip install tox --break-system-packages tox
- name: Run tests
run: |
tox -e unit
Expand Down Expand Up @@ -59,6 +59,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install dependencies
run: python -m pip install tox --break-system-packages tox
- name: Setup hosts for tests
run: |
echo "10.64.140.43 testing-ratings.foo.bar" | sudo tee -a /etc/hosts
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ The following configuration options are available on the Container Runner charm:
- **Description**:
Expects the string content of a `.env` file, with each variable on a new line.

### Setting up proxy configuration

In order to pass `http_proxy` and `https_proxy` settings into the charm, and have them used by the charm and Docker daemon, set the `juju-https-proxy` and `juju-http-proxy` model configuration settings:

```
juju model-config juju-https-proxy=http://my.proxy:1234
juju model-config juju-http-proxy=http://my.proxy:1234
```

These configuration settings are scoped to the model, not the unit. More on Juju model config can be found [here](https://juju.is/docs/juju/juju-model-config).

# How-to guides

The following are a series of how-to's to guide you through managing and deploying a containerized application via the Container Runner charm.
Expand Down
Loading

0 comments on commit fbacf92

Please sign in to comment.