Skip to content

Commit f32edbb

Browse files
authored
Update containerfile to deploy gh package (#62)
* Update containerfile to deploy gh package - updated packagelist for gh - updated README with gh version in the package table * updated tests/versions targets
1 parent 28864f8 commit f32edbb

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

Containerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,16 @@ ARG HYPERSHIFT_URL="https://developers.redhat.com/content-gateway/file/pub/mce/c
5353

5454
USER root
5555

56+
ADD https://cli.github.com/packages/rpm/gh-cli.repo /etc/yum.repos.d/gh-cli.repo
57+
5658
# 'pip' is expected to be the pip resolved by 'python3 pip' AKA the one we install with PYTHON_VERSION
5759
RUN microdnf --disableplugin=subscription-manager install -y ${PYTHON_PKGS} && microdnf --disableplugin=subscription-manager clean all
5860
RUN alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 0
5961

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

63-
RUN microdnf --disableplugin=subscription-manager install -y make git-core tar vi jq which findutils diffutils sshpass gzip $EXTRARPMS && \
65+
RUN microdnf --disableplugin=subscription-manager install -y make git-core tar vi jq which findutils diffutils sshpass gzip gh $EXTRARPMS && \
6466
microdnf remove -y $DNF_TO_REMOVE && \
6567
rpm -e --nodeps $RPM_TO_FORCEFULLY_REMOVE && \
6668
microdnf clean all && \

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ TESTCOMMAND := "set -e; echo '* Helm: '; helm version; \
99
echo '* Tekton: '; tkn version ; \
1010
echo '* oc: '; oc version ; \
1111
echo '* yq: '; yq --version ; \
12+
echo '* gh: '; gh version ; \
1213
echo '* Python: '; python --version ; \
1314
echo '* Ansible: '; ansible --version ; \
1415
echo '* kubernetes.core: '; ansible-galaxy collection list | grep kubernetes.core ; \
@@ -99,6 +100,7 @@ versions: ## Print all the versions of software in the locally-built container
99100
echo -n \"|make package \"; rpm -q --qf '%{VERSION}' make; echo \" \"; \
100101
echo -n \"|python package \"; /usr/bin/python3 --version | sed -e s'/Python //' | tr -d '\n'; echo \" \"; \
101102
echo -n \"|jq package \"; rpm -q --qf '%{VERSION}' jq; echo \" \"; \
103+
echo -n \"|gh package \"; rpm -q --qf '%{VERSION}' gh; echo \" \"; \
102104
echo -n \"|argocd binary \"; argocd version --client -o json | jq -j '.client.Version'; echo \" \"; \
103105
echo -n \"|helm binary \"; helm version --template '{{ .Version }}'; echo \" \"; \
104106
echo -n \"|tea binary \"; tea --version | sed -e 's/Version: //' | sed -e 's/golang.*//' | tr -d '\t' | tr -d '\n'; echo \" \"; \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ This container provides a pre-configured environment with all the necessary tool
2626
|community.general |collection|11.2.1 |
2727
|community.okd |collection|5.0.0 |
2828
|gcloud |pip |0.18.3 |
29+
|gh |package |2.78.0 |
2930
|git-core |package |2.47.3 |
3031
|gzip |package |1.12 |
3132
|hcp |binary |4.17.0 |

0 commit comments

Comments
 (0)