Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update runc Go dependency and Jinja2 templating base image #590

Merged
merged 2 commits into from
Dec 22, 2021
Merged

Update runc Go dependency and Jinja2 templating base image #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863dc7b
Update runc Go dependency and Jinja2 templating base image
pkosiec Dec 21, 2021
2943b28
Fix Python dependencies
pkosiec Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ require (
github.com/olekukonko/tablewriter v0.0.4
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/opencontainers/runc v1.0.2 // indirect
github.com/opencontainers/runc v1.0.3 // indirect
github.com/pkg/errors v0.9.1
github.com/rancher/k3d/v4 v4.4.8
github.com/sethvargo/go-password v0.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,8 +1332,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg=
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
github.com/opencontainers/runc v1.0.3 h1:1hbqejyQWCJBvtKAfdO0b1FmaEf2z/bxnjqbARass5k=
github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
Expand Down
4 changes: 2 additions & 2 deletions hack/images/jinja2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:rc-alpine
FROM python:3.10-alpine3.15

# Create folders
RUN mkdir /templates/ /variables/
Expand All @@ -10,7 +10,7 @@ ENV TEMPLATES_DIR /templates
# Copy extra scripts: embedded render
COPY jinja2-cli/ $SCRIPTS_DIR/jinja2-cli

RUN pip3 install --no-cache-dir pip==21.1.1
RUN pip3 install --no-cache-dir pip==21.3.1
RUN pip3 install --no-cache-dir $SCRIPTS_DIR/jinja2-cli[yaml]

ENTRYPOINT ["jinja2"]
2 changes: 1 addition & 1 deletion hack/images/jinja2/jinja2-cli/jinja2cli/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def as_dict(self):
def _load_yaml():
import yaml

return yaml.load, yaml.YAMLError, MalformedYAML
return yaml.safe_load, yaml.YAMLError, MalformedYAML


def _load_querystring():
Expand Down
6 changes: 3 additions & 3 deletions hack/images/jinja2/jinja2-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
license="BSD",
install_requires=install_requires,
extras_require={
"yaml": install_requires + ["pyyaml"],
"toml": install_requires + ["toml"],
"xml": install_requires + ["xmltodict"],
"yaml": install_requires + ["pyyaml~=6.0.0"],
"toml": install_requires + ["toml~=0.10.2"],
"xml": install_requires + ["xmltodict~=0.12.0"],
"tests": install_requires + tests_requires,
},
tests_require=tests_requires,
Expand Down