Skip to content

Commit

Permalink
Merge branch 'allenporter:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexsaphir authored May 7, 2024
2 parents 84b4394 + 171e3bc commit c850bc0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker environment for local development in devcontainer

FROM ubuntu:jammy-20240416
FROM ubuntu:jammy-20240427

RUN apt-get update --fix-missing && \
apt-get upgrade -y && \
Expand All @@ -14,7 +14,7 @@ RUN apt-get update --fix-missing && \

COPY --from=docker.io/bitnami/kubectl:1.30.0 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
COPY --from=registry.k8s.io/kustomize/kustomize:v5.4.1 /app/kustomize /usr/local/bin/kustomize
COPY --from=ghcr.io/kyverno/kyverno-cli:v1.12.0 /ko-app/kubectl-kyverno /usr/local/bin/kyverno
COPY --from=ghcr.io/kyverno/kyverno-cli:v1.12.1 /ko-app/kubectl-kyverno /usr/local/bin/kyverno
COPY --from=docker.io/alpine/helm:3.14.4 /usr/bin/helm /usr/local/bin/helm
COPY --from=ghcr.io/fluxcd/flux-cli:v2.2.3 /usr/local/bin/flux /usr/local/bin/flux

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
hooks:
- id: codespell
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: 'v0.4.2'
rev: 'v0.4.3'
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY --from=ghcr.io/fluxcd/flux-cli:v2.2.3 /usr/local/bin/flux
COPY --from=docker.io/alpine/helm:3.14.4 /usr/bin/helm /usr/local/bin/helm
COPY --from=docker.io/bitnami/kubectl:1.30.0 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl
COPY --from=registry.k8s.io/kustomize/kustomize:v5.4.1 /app/kustomize /usr/local/bin/kustomize
COPY --from=ghcr.io/kyverno/kyverno-cli:v1.12.0 /ko-app/kubectl-kyverno /usr/local/bin/kyverno
COPY --from=ghcr.io/kyverno/kyverno-cli:v1.12.1 /ko-app/kubectl-kyverno /usr/local/bin/kyverno

USER 1001
ENTRYPOINT ["/usr/local/bin/flux-local"]
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
aiofiles==23.2.1
black==24.4.2
coverage==7.5.0
coverage==7.5.1
GitPython==3.1.43
mashumaro==3.12
mashumaro==3.13
mypy==1.10.0
nest_asyncio==1.6.0
pdoc==14.4.0
Expand All @@ -13,7 +13,7 @@ pytest-asyncio==0.23.6
pytest-cov==5.0.0
python-slugify==8.0.4
PyYAML==6.0.1
ruff==0.4.2
ruff==0.4.3
types-aiofiles==23.2.0.20240403
types-PyYAML==6.0.12.20240311
typing-extensions==4.11.0
Expand Down

0 comments on commit c850bc0

Please sign in to comment.