UNCLASSIFIED

Commit 8826411b authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'yum-fix' into 'development'

Corrected yum in Dockerfile

See merge request dsop/solutions-delivery-platform/jenkins/jenkinsfile-runner!3
parents 2df29db9 95e13860
Pipeline #259003 passed with stages
in 12 minutes and 18 seconds
...@@ -3,7 +3,7 @@ ARG BASE_IMAGE=redhat/openjdk/openjdk11 ...@@ -3,7 +3,7 @@ ARG BASE_IMAGE=redhat/openjdk/openjdk11
ARG BASE_TAG=1.11 ARG BASE_TAG=1.11
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
USER root USER root
# Establish ARG and ENV variables
ARG TARBALL=jenkinsfile-runner-dependencies-dcar-1.8 ARG TARBALL=jenkinsfile-runner-dependencies-dcar-1.8
ENV JENKINS_UC https://updates.jenkins.io ENV JENKINS_UC https://updates.jenkins.io
ENV CASC_JENKINS_CONFIG /usr/share/jenkins/ref/casc ENV CASC_JENKINS_CONFIG /usr/share/jenkins/ref/casc
...@@ -15,16 +15,15 @@ ARG user=jenkins ...@@ -15,16 +15,15 @@ ARG user=jenkins
ARG group=jenkins ARG group=jenkins
ARG uid=1000 ARG uid=1000
ARG gid=1000 ARG gid=1000
COPY LICENSE /licenses COPY LICENSE /licenses
COPY ${TARBALL}.tar.gz /tmp/${TARBALL}.tar.gz COPY ${TARBALL}.tar.gz /tmp/${TARBALL}.tar.gz
# Install necessary packages using yum
RUN INSTALL_PKGS="git" && \ RUN INSTALL_PKGS="git-core" && \
yum -y update-minimal --setopt=tsflags=nodocs \ yum -y update-minimal --setopt=tsflags=nodocs \
--security && \ --security && \
yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS} yum -y install --setopt=tsflags=nodocs ${INSTALL_PKGS}
# Unpackage dependency tarball, create and own directories, and clean up
RUN cd /tmp && tar -xzf ${TARBALL}.tar.gz \ RUN tar -xzf /tmp/${TARBALL}.tar.gz \
&& mkdir -p $JENKINS_HOME $TMP_DIR /usr/share/jenkins /build \ && mkdir -p $JENKINS_HOME $TMP_DIR /usr/share/jenkins /build \
&& mv dependencies/ref /usr/share/jenkins/ref \ && mv dependencies/ref /usr/share/jenkins/ref \
&& mv dependencies/app /app \ && mv dependencies/app /app \
...@@ -35,11 +34,10 @@ RUN cd /tmp && tar -xzf ${TARBALL}.tar.gz \ ...@@ -35,11 +34,10 @@ RUN cd /tmp && tar -xzf ${TARBALL}.tar.gz \
&& chown ${uid}:${gid} /usr/share/jenkins \ && chown ${uid}:${gid} /usr/share/jenkins \
&& chown ${uid}:${gid} /build \ && chown ${uid}:${gid} /build \
&& groupadd -g ${gid} ${group} \ && groupadd -g ${gid} ${group} \
&& useradd -d "$JENKINS_HOME" -d "$TMP_DIR" -d /app -d /usr/share/jenkins -u ${uid} -g ${gid} -m -s /bin/bash ${user} && useradd -d "$JENKINS_HOME" -d "$TMP_DIR" -d /app -d /usr/share/jenkins -u ${uid} -g ${gid} -m -s /bin/bash ${user} \
&& chmod ug-s /usr/libexec/openssh/ssh-keysign \
RUN cd /usr/share/jenkins/ref/plugins && \ && rm -rf /usr/share/jenkins/ref/plugins/github*
rm -rf github* # Set volumes to retain data, switch to jenkins user, and set entrypoint
VOLUME /build VOLUME /build
VOLUME /usr/share/jenkins/ref/casc VOLUME /usr/share/jenkins/ref/casc
VOLUME $JENKINS_HOME VOLUME $JENKINS_HOME
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment