Skip to content

Commit

Permalink
Merge pull request #84 from cytopia/release-0.37
Browse files Browse the repository at this point in the history
Release 0.37
  • Loading branch information
cytopia authored Oct 24, 2021
2 parents 56df4ef + 2d97b6c commit 2abab24
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- '2.8'
- '2.9'
- '2.10'
- '2.11'
- 'latest'
helm:
- "2.11"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-kops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- '2.8'
- '2.9'
- '2.10'
- '2.11'
- 'latest'
kops:
- "1.8"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- '2.8'
- '2.9'
- '2.10'
- '2.11'
- 'latest'
steps:

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- '2.8'
- '2.9'
- '2.10'
- '2.11'
- 'latest'
helm:
- "2.11"
Expand All @@ -50,7 +51,7 @@ jobs:
- "3.7"
refs:
- 'master'
- '0.36'
- '0.37'
steps:

# ------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly-kops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- '2.8'
- '2.9'
- '2.10'
- '2.11'
- 'latest'
kops:
- "1.8"
Expand All @@ -51,7 +52,7 @@ jobs:
- "1.22"
refs:
- 'master'
- '0.36'
- '0.37'
steps:

# ------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ jobs:
- '2.8'
- '2.9'
- '2.10'
- '2.11'
- 'latest'
refs:
- 'master'
- '0.36'
- '0.37'
steps:

# ------------------------------------------------------------
Expand Down
9 changes: 9 additions & 0 deletions Dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,18 @@ RUN set -eux \
pip3 install --no-cache-dir --no-binary pyyaml "ansible>=${VERSION},<2.10"; \
elif [ "${VERSION}" = "2.10" ]; then \
pip3 install --no-cache-dir --no-binary pyyaml "ansible>=${VERSION},<2.11"; \
elif [ "${VERSION}" = "2.11" ]; then \
pip3 install --no-cache-dir --no-binary pyyaml "ansible-core>=${VERSION},<2.12"; \
else \
pip3 install --no-cache-dir --no-binary pyyaml "ansible>=${VERSION},<$(echo "${VERSION}+0.1" | bc)"; \
fi \
\
&& if [ "${VERSION}" != "latest" ]; then \
ansible --version | grep ^ansible | grep -E "${VERSION}\.[0-9]+" \
&& ansible-playbook --version | grep ^ansible | grep -E "${VERSION}\.[0-9]+" \
&& ansible-galaxy --version | grep ^ansible | grep -E "${VERSION}\.[0-9]+"; \
fi \
\
&& find /usr/lib/ -name '__pycache__' -print0 | xargs -0 -n1 rm -rf \
&& find /usr/lib/ -name '*.pyc' -print0 | xargs -0 -n1 rm -rf

Expand Down
1 change: 1 addition & 0 deletions Dockerfiles/Dockerfile-infra
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN set -eux \
docker \
docker-compose \
jsondiff \
netaddr \
pexpect \
psycopg2 \
pymongo \
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
> [goimports][gimp-git-lnk] ****
> [golint][glint-git-lnk] ****
> [jsonlint][jlint-git-lnk] ****
> [kubeval][kubeval-git-lnk] ****
> [linkcheck][linkcheck-git-lnk] ****
> [mypy][mypy-git-lnk] ****
> [php-cs-fixer][pcsf-git-lnk] ****
Expand Down Expand Up @@ -73,7 +74,7 @@ The following table shows a quick overview. For more details see further down be
|---------|---------------|------------------------|---------------------|
| base | - | `cffi`, `cryptography`, `Jinja2`, `junit-xml`, `lxml`, `paramiko`, `PyYAML` | - |
| tools | base | `dnspython`, `mitogen` | `bash`, `git`, `gpg`, `jq`, `ssh`, `yq` |
| infra | tools | `docker`, `docker-compose`, `jsondiff`, `pexpect`, `psycopg2`, `pypsexec`, `pymongo`, `PyMySQL`, `smbprotocol` | `rsync` |
| infra | tools | `docker`, `docker-compose`, `jsondiff`, `netaddr`, `pexpect`, `psycopg2`, `pypsexec`, `pymongo`, `PyMySQL`, `smbprotocol` | `rsync` |
| azure | tools | `azure-*` | - |
| aws | tools | `awscli`, `botocore`, `boto`, `boto3` | `aws`, `aws-iam-authenticator` |
| awsk8s | aws | `openshift` | `kubectl`, `oc` |
Expand Down Expand Up @@ -1141,6 +1142,7 @@ linter below for reproducible local or remote CI tests:
| [golint][glint-git-lnk] | [![glint-hub-img]][glint-hub-lnk] | Go | Lint Go code |
| [eslint][elint-git-lnk] | [![elint-hub-img]][elint-hub-lnk] | Javascript | Lint Javascript code |
| [jsonlint][jlint-git-lnk] | [![jlint-hub-img]][jlint-hub-lnk] | JSON | Lint JSON files **<sup>[1]</sup>** |
| [kubeval][kubeval-git-lnk] | [![kubeval-hub-img]][kubeval-hub-lnk] | K8s | Lint Kubernetes files |
| [checkmake][cm-git-lnk] | [![cm-hub-img]][cm-hub-lnk] | Make | Lint Makefiles |
| [phpcbf][pcbf-git-lnk] | [![pcbf-hub-img]][pcbf-hub-lnk] | PHP | PHP Code Beautifier and Fixer |
| [phpcs][pcs-git-lnk] | [![pcs-hub-img]][pcs-hub-lnk] | PHP | PHP Code Sniffer |
Expand Down Expand Up @@ -1184,6 +1186,10 @@ linter below for reproducible local or remote CI tests:
[alint-hub-img]: https://img.shields.io/docker/pulls/cytopia/ansible-lint.svg
[alint-hub-lnk]: https://hub.docker.com/r/cytopia/ansible-lint

[kubeval-git-lnk]: https://github.com/cytopia/docker-kubeval
[kubeval-hub-img]: https://img.shields.io/docker/pulls/cytopia/kubeval.svg
[kubeval-hub-lnk]: https://hub.docker.com/r/cytopia/kubeval

[gfmt-git-lnk]: https://github.com/cytopia/docker-gofmt
[gfmt-hub-img]: https://img.shields.io/docker/pulls/cytopia/gofmt.svg
[gfmt-hub-lnk]: https://hub.docker.com/r/cytopia/gofmt
Expand Down

0 comments on commit 2abab24

Please sign in to comment.