diff --git a/.github/linters/.hadolint.yaml b/.github/linters/.hadolint.yaml index 6826e7f..8edd5a3 100644 --- a/.github/linters/.hadolint.yaml +++ b/.github/linters/.hadolint.yaml @@ -11,3 +11,5 @@ ignored: - DL3041 # Pin versions in pip. Instead of `pip install ` use `pip install - DL3013 + # Disable pipefail shell + - DL4006 diff --git a/.hadolint.yaml b/.hadolint.yaml index bd4c2a6..406c27c 120000 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1 +1 @@ -.github/linters/.hadolint.yml \ No newline at end of file +.github/linters/.hadolint.yaml \ No newline at end of file diff --git a/Containerfile b/Containerfile index 4f04f34..a150175 100644 --- a/Containerfile +++ b/Containerfile @@ -24,10 +24,10 @@ ARG COLLECTIONS_TO_REMOVE="fortinet cisco dellemc f5networks junipernetworks mel ARG DNF_TO_REMOVE="dejavu-sans-fonts langpacks-core-font-en langpacks-core-en langpacks-en" ARG RPM_TO_FORCEFULLY_REMOVE="cracklib-dicts" # Versions -ARG OPENSHIFT_CLIENT_VERSION="4.14.20" +ARG OPENSHIFT_CLIENT_VERSION="4.20.14" ARG HYPERSHIFT_VERSION="2.7.2-1" -ARG HELM_VERSION="3.13.3" -ARG ARGOCD_VERSION="2.9.7" +ARG HELM_VERSION="3.19.5" +ARG ARGOCD_VERSION="3.1.12" ARG TKN_CLI_VERSION="0.35.2" ARG YQ_VERSION="4.40.7" ARG TEA_VERSION="0.9.2" diff --git a/Makefile b/Makefile index 591f2c0..ae2f2c2 100644 --- a/Makefile +++ b/Makefile @@ -102,8 +102,10 @@ versions: ## Print all the versions of software in the locally-built container echo -n \"|python package \"; /usr/bin/python3 --version | sed -e s'/Python //' | tr -d '\n'; echo \" \"; \ echo -n \"|jq package \"; rpm -q --qf '%{VERSION}' jq; echo \" \"; \ echo -n \"|gh package \"; rpm -q --qf '%{VERSION}' gh; echo \" \"; \ + echo -n \"|age binary \"; age --version |tr -d '\n'; echo \" \"; \ echo -n \"|argocd binary \"; argocd version --client -o json | jq -j '.client.Version'; echo \" \"; \ echo -n \"|helm binary \"; helm version --template '{{ .Version }}'; echo \" \"; \ + echo -n \"|helmsecrets binary \"; helm plugin list |grep ^secrets | tr '[:blank:]' ' '| cut -f2 -d\ | tr -d '\n'; echo \" \"; \ echo -n \"|tea binary \"; tea --version | sed -e 's/Version: //' | sed -e 's/golang.*//' | tr -d '\t' | tr -d '\n'; echo \" \"; \ echo -n \"|tekton binary \"; tkn version --component client | tr -d '\n'; echo \" \"; \ echo -n \"|openshift binary \"; oc version --client -o json | jq -j '.releaseClientVersion'; echo \" \"; \ diff --git a/README.md b/README.md index fc2bea2..aa72063 100644 --- a/README.md +++ b/README.md @@ -14,51 +14,50 @@ This container provides a pre-configured environment with all the necessary tool -| name | type | version | -| :---------------------------------: | :---------: | :------------: | -| age | binary | 1.3.1 | -| ansible | pip | 2.16.14 | -| ansible.posix | collection | 2.1.0 | -| ansible-runner | pip | 2.4.2 | -| ansible.utils | collection | 6.0.0 | -| argocd | binary | v2.9.7+fbb6b20 | -| awscli | pip | 1.42.65 | -| awx.awx | collection | 24.6.1 | -| awxkit | pip | 24.6.1 | -| azure-cli | pip | 2.79.0 | -| boto3 | pip | 1.40.65 | -| botocore | pip | 1.40.65 | -| community.general | collection | 12.0.0 | -| community.okd | collection | 5.0.0 | -| gcloud | pip | 0.18.3 | -| gh | package | 2.82.1 | -| git-core | package | 2.47.3 | -| gzip | package | 1.12 | -| hcp | binary | 4.17.0 | -| helm | binary | v3.13.3 | -| helm-secrets | helm plugin | 4.7.5 | -| infra.ah_configuration | collection | 2.1.0 | -| infra.controller_configuration | collection | 3.2.0 | -| infra.eda_configuration | collection | 1.1.0 | -| jmespath | pip | 1.0.1 | -| jq | package | 1.6 | -| kubernetes.core | collection | 6.2.0 | -| kubernetes | pip | 34.1.0 | -| kustomize | binary | v5.0.1 | -| make | package | 4.3 | -| openshift | binary | 4.14.20 | -| pytest | pip | 8.4.2 | -| python3-pip | package | 21.3.1 | -| python | package | 3.11.11 | -| redhat_cop.controller_configuration | collection | 2.3.1 | -| rhvp.cluster_utils | collection | 1.1.0 | -| sops | binary | 3.11.0 | -| sshpass | package | 1.09 | -| tar | package | 1.34 | -| tea | binary | 0.9.2 | -| tekton | binary | 0.35.2 | -| vi | package | 8.2.2637 | -| vp-qe-test-common | pip | 0.1.0 | +| name | type | version | +| :---------------------------------: | :---------: | :-------------: | +| age | binary | 1.3.1 | +| ansible | pip | 2.19.6 | +| ansible.posix | collection | 2.1.0 | +| ansible-runner | pip | 2.4.2 | +| ansible.utils | collection | 6.0.1 | +| argocd | binary | v3.1.12+a46152e | +| awscli | pip | 1.44.39 | +| awx.awx | collection | 24.6.1 | +| awxkit | pip | 24.6.1 | +| azure-cli | pip | 2.83.0 | +| boto3 | pip | 1.42.49 | +| botocore | pip | 1.42.49 | +| community.general | collection | 12.3.0 | +| community.okd | collection | 5.0.0 | +| gcloud | pip | 0.18.3 | +| gh | package | 2.86.0 | +| git-core | package | 2.47.3 | +| gzip | package | 1.12 | +| hcp | binary | 4.17.0 | +| helm | binary | v3.19.5 | +| helm-secrets | helm plugin | 4.7.5 | +| infra.ah_configuration | collection | 2.1.0 | +| infra.controller_configuration | collection | 3.2.2 | +| infra.eda_configuration | collection | 1.1.0 | +| jmespath | pip | 1.1.0 | +| jq | package | 1.6 | +| kubernetes.core | collection | 6.3.0 | +| kubernetes | pip | 35.0.0 | +| kustomize | binary | v5.6.0 | +| make | package | 4.3 | +| openshift | binary | 4.20.14 | +| pytest | pip | 9.0.2 | +| python3-pip | package | 21.3.1 | +| python | package | 3.11.13 | +| redhat_cop.controller_configuration | collection | 2.3.1 | +| rhvp.cluster_utils | collection | 1.1.0 | +| sshpass | package | 1.09 | +| tar | package | 1.34 | +| tea | binary | 0.9.2 | +| tekton | binary | 0.35.2 | +| vi | package | 8.2.2637 | +| vp-qe-test-common | pip | 0.0.1 |