minor tweaks from downstream (eclipse-che#394)

Change-Id: Ie7c17747dd4c29f42e1147188b595690c7bb271f Signed-off-by: nickboldt <[email protected]>
apupier · Feb 24, 2020 · 5bee6b9 · 5bee6b9
1 parent c1e3004
commit 5bee6b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile
@@ -42,7 +42,7 @@ ENV BOOTSTRAP=${BOOTSTRAP} \
 
 # NOTE: uncomment for local build. Must also set full registry path in FROM to registry.redhat.io or registry.access.redhat.com
 # enable rhel 7 or 8 content sets (from Brew) to resolve jq as rpm
-COPY ./build/dockerfiles/content_sets_centos8_appstream.repo /etc/yum.repos.d/
+COPY ./build/dockerfiles/content_set*.repo /etc/yum.repos.d/
 
 COPY ./build/dockerfiles/rhel.install.sh /tmp
 RUN /tmp/rhel.install.sh && rm -f /tmp/rhel.install.sh

diff --git a/build/dockerfiles/rhel.install.sh b/build/dockerfiles/rhel.install.sh
@@ -11,7 +11,10 @@
 microdnf install -y findutils bash wget yum gzip tar jq python3-six python3-pip skopeo && microdnf -y clean all && \
 # install yq (depends on jq and pyyaml - if jq and pyyaml not already installed, this will try to compile it)
 if [[ -f /tmp/root-local.tgz ]] || [[ ${BOOTSTRAP} == "true" ]]; then \
-    mkdir -p /root/.local; tar xf /tmp/root-local.tgz -C /root/.local/; rm -fr /tmp/root-local.tgz;  \
+    mkdir -p /root/.local; \
+	if [[ -f /tmp/root-local.tgz ]]; then \
+		tar xf /tmp/root-local.tgz -C /root/.local/; rm -fr /tmp/root-local.tgz; \
+	fi; \
     /usr/bin/pip3.6 install --user yq jsonschema; \
     # could be installed in /opt/app-root/src/.local/bin or /root/.local/bin
     for d in /opt/app-root/src/.local /root/.local; do \