From 0c8505d84eff366b7656b76862c3c195241c98b3 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Tue, 31 Oct 2017 11:42:42 +0200 Subject: [PATCH] fix: tag replacement regex for Dockerbuilds. tune jenkins-slave-full Dockerfile. --- bin/build.sh | 2 +- images/jenkins-slave-full-centos7/Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index d129684..ac9209f 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -110,7 +110,7 @@ function dockerbuild() { cp $DOCKERFILE ${DOCKERFILE}.original from=$(fromimagename $DOCKERFILE) echo "Replace image FROM: $from with $from:$BUILDER_TAG" - sed -E "s|FROM ([a-zA-Z0-9\.\/:]+)|FROM ${from}:${BUILDER_TAG}|g" $DOCKERFILE > ${DOCKERFILE}.${BUILDER_TAG} + sed -E "s|FROM ([a-zA-Z0-9\.\/\:]+)|FROM ${from}:${BUILDER_TAG}|g" $DOCKERFILE > ${DOCKERFILE}.${BUILDER_TAG} cp ${DOCKERFILE}.${BUILDER_TAG} $DOCKERFILE fi diff --git a/images/jenkins-slave-full-centos7/Dockerfile b/images/jenkins-slave-full-centos7/Dockerfile index 362007a..a935535 100644 --- a/images/jenkins-slave-full-centos7/Dockerfile +++ b/images/jenkins-slave-full-centos7/Dockerfile @@ -1,4 +1,4 @@ -FROM openshift/jenkins-slave-maven-centos7 +FROM openshift/jenkins-slave-maven-centos7:latest-slave-maven-centos7:latest ENV NODEJS_VERSION=4.4 \ NPM_CONFIG_PREFIX=$HOME/.npm-global \ @@ -7,6 +7,8 @@ ENV NODEJS_VERSION=4.4 \ ENV=/usr/local/bin/scl_enable \ PROMPT_COMMAND=". /usr/local/bin/scl_enable" +USER root + COPY contrib/bin/scl_enable /usr/local/bin/scl_enable @@ -22,12 +24,10 @@ COPY contrib/google-chrome.repo /etc/yum.repos.d/google-chrome.repo # Install Yarn and Xvfb RUN curl https://dl.yarnpkg.com/rpm/yarn.repo > /etc/yum.repos.d/yarn.repo && \ - curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - && \ - yum install -y google-chrome-stable xorg-x11-server-Xvfb liberation-mono-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts yarn nodejs gcc-c++ make && \ + yum install -y google-chrome-stable xorg-x11-server-Xvfb liberation-mono-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts yarn gcc-c++ make && \ mkdir /.cache /.config && chmod 777 /.cache /.config && \ dbus-uuidgen > /etc/machine-id - RUN chown -R 1001:0 $HOME && \ chmod -R g+rw $HOME