Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ ARG HYPERSHIFT_URL="https://developers.redhat.com/content-gateway/file/pub/mce/c

USER root

ADD https://cli.github.com/packages/rpm/gh-cli.repo /etc/yum.repos.d/gh-cli.repo

# 'pip' is expected to be the pip resolved by 'python3 pip' AKA the one we install with PYTHON_VERSION
RUN microdnf --disableplugin=subscription-manager install -y ${PYTHON_PKGS} && microdnf --disableplugin=subscription-manager clean all
RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 0

# Add requirements.yml file for ansible collections
COPY requirements.yml /tmp/requirements.yml

RUN microdnf --disableplugin=subscription-manager install -y make git-core tar vi jq which findutils diffutils sshpass gzip $EXTRARPMS && \
RUN microdnf --disableplugin=subscription-manager install -y make git-core tar vi jq which findutils diffutils sshpass gzip gh $EXTRARPMS && \
microdnf remove -y $DNF_TO_REMOVE && \
rpm -e --nodeps $RPM_TO_FORCEFULLY_REMOVE && \
microdnf clean all && \
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TESTCOMMAND := "set -e; echo '* Helm: '; helm version; \
echo '* Tekton: '; tkn version ; \
echo '* oc: '; oc version ; \
echo '* yq: '; yq --version ; \
echo '* gh: '; gh version ; \
echo '* Python: '; python --version ; \
echo '* Ansible: '; ansible --version ; \
echo '* kubernetes.core: '; ansible-galaxy collection list | grep kubernetes.core ; \
Expand Down Expand Up @@ -99,6 +100,7 @@ versions: ## Print all the versions of software in the locally-built container
echo -n \"|make package \"; rpm -q --qf '%{VERSION}' make; echo \" \"; \
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 \"|argocd binary \"; argocd version --client -o json | jq -j '.client.Version'; echo \" \"; \
echo -n \"|helm binary \"; helm version --template '{{ .Version }}'; echo \" \"; \
echo -n \"|tea binary \"; tea --version | sed -e 's/Version: //' | sed -e 's/golang.*//' | tr -d '\t' | tr -d '\n'; echo \" \"; \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ This container provides a pre-configured environment with all the necessary tool
|community.general |collection|11.2.1 |
|community.okd |collection|5.0.0 |
|gcloud |pip |0.18.3 |
|gh |package |2.78.0 |
|git-core |package |2.47.3 |
|gzip |package |1.12 |
|hcp |binary |4.17.0 |
Expand Down