Skip to content

Commit eba2c9b

Browse files
author
Sean Sundberg
committed
Updates for OCP 4.3 support (and IKS and OCP 3.11 regression testing)
- Sets KUBECTL_VERSION to v1.15.5 to fix issue in IKS of Jenkins ingress not creating - Changes permissions on devops home directory to allow users with root group to access
1 parent c789b96 commit eba2c9b

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENV SUPPORTED_CALICO 3.12.0
88
ENV NVM_VERSION 0.35.2
99
ENV NODE_VERSION 12
1010
ENV SOLSA_VERSION 0.3.5
11+
ENV KUBECTL_VERSION 1.15.5
1112

1213
RUN dnf install -y dnf-plugins-core --disableplugin=subscription-manager && \
1314
dnf install -y golang --disableplugin=subscription-manager && \
@@ -62,7 +63,7 @@ ENV HOME /home/devops
6263
# Create devops user
6364
RUN groupadd --force sudo && \
6465
groupadd -g 10000 devops && \
65-
useradd -u 10000 -g 10000 -G sudo -d ${HOME} -m devops && \
66+
useradd -u 10000 -g 10000 -G sudo,root -d ${HOME} -m devops && \
6667
usermod --password $(echo password | openssl passwd -1 -stdin) devops
6768

6869
USER devops
@@ -138,11 +139,12 @@ RUN curl -L https://github.com/openshift/origin/releases/download/v3.11.0/opensh
138139
tar xzf oc-client.tar.gz && \
139140
sudo cp openshift-origin-client-tools*/oc /usr/local/bin && \
140141
sudo chmod +x /usr/local/bin/oc && \
141-
rm -rf openshift-origin-client-tools*
142+
rm -rf openshift-origin-client-tools* && \
143+
rm oc-client.tar.gz
142144
# sudo cp openshift-origin-client-tools*/kubectl /usr/local/bin && \
143145
# sudo chmod +x /usr/local/bin/kubectl && \
144146

145-
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl && \
147+
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
146148
chmod +x ./kubectl && \
147149
sudo mv ./kubectl /usr/local/bin
148150

@@ -151,4 +153,6 @@ RUN sudo mv /usr/local/bin/helm /usr/local/bin/helm2 && \
151153
sudo mv /usr/local/bin/helm /usr/local/bin/helm3 && \
152154
sudo ln -s /usr/local/bin/helm2 /usr/local/bin/helm
153155

156+
RUN sudo chown -R devops ${HOME} && sudo chgrp -R 0 ${HOME} && sudo chmod -R g=u ${HOME}
157+
154158
ENTRYPOINT ["/bin/bash", "--init-file", "/home/devops/.bashrc-ni"]

0 commit comments

Comments
 (0)