Skip to content

Commit

Permalink
Merge branch 'master' into pluggable-inventory
Browse files Browse the repository at this point in the history
  • Loading branch information
MatteoVoges committed Jul 5, 2023
2 parents 08a2194 + 15dc890 commit 228ac23
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ WORKDIR /kapitan

COPY ./kapitan ./kapitan
COPY ./MANIFEST.in ./MANIFEST.in
COPY ./requirements.txt ./requirements.txt
COPY ./pyproject.toml ./pyproject.toml
COPY ./README.md ./README.md

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Join the community [`#kapitan`](https://kubernetes.slack.com/archives/C981W2HD3)
## [**Official site**](https://kapitan.dev) <https://kapitan.dev>


## [**Quick Start**](https://kapitan.dev/kapitan_overview/#quickstart)
## [**Quick Start**](https://kapitan.dev/getting_started/#quickstart))

## Install Kapitan

Expand Down
2 changes: 1 addition & 1 deletion requirements.docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ markdown-include==0.7.0
mkdocs-material-extensions==1.1
mkdocs-material==8.5.10
mkdocs==1.4.2
pymdown-extensions==9.8
pymdown-extensions==10.0
Empty file removed requirements.txt
Empty file.
2 changes: 1 addition & 1 deletion tests/test_vault.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}

vault_container = client.containers.run(
image="vault",
image="hashicorp/vault",
cap_add=["IPC_LOCK"],
ports={"8200": "8200"},
environment=env,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_vault_transit.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def find_free_port():
}

vault_container = client.containers.run(
image="vault",
image="hashicorp/vault",
cap_add=["IPC_LOCK"],
ports={8200: DOCKER_PORT},
environment=env,
Expand Down

0 comments on commit 228ac23

Please sign in to comment.