Merge pull request #68081 from aireilly/update-dockerfile

Use ubi image only

Author: aireilly

asciibinder.Dockerfile

@@ -1,17 +1,13 @@
-FROM ruby:3.1.2-alpine3.16 AS builder
+FROM registry.ci.openshift.org/ocp/ubi-ruby-27:8
 
-RUN apk update && apk add --virtual build-dependencies build-base
+ENV LANG=en_US.UTF-8
 
-RUN gem install listen ascii_binder
+USER root
 
-FROM ruby:3.1.2-alpine3.16
+RUN gem install listen ascii_binder && yum clean all
 
-COPY --from=builder /usr/local/bundle /usr/local/bundle
-
-RUN apk add --update --no-cache diffutils findutils git
+WORKDIR /src
 
 RUN git config --system --add safe.directory '*'
 
-WORKDIR /src
-
-CMD ["/bin/sh"]
+CMD ["/bin/bash"]

asciidoctor.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.ci.openshift.org/ocp/ubi-minimal:8
 
 WORKDIR /src
 
@@ -8,4 +8,4 @@ RUN gem install asciidoctor asciidoctor-diagram
 
 RUN git config --system --add safe.directory '*'
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]

python-tools.Dockerfile

@@ -1,13 +1,13 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.ci.openshift.org/ocp/ubi-minimal:8
 
 WORKDIR /src
 
 RUN microdnf install -y git python39 python39-pip which && microdnf clean all && rm -rf /var/cache/yum
 
 COPY ./aura.tar.gz /src
 
-RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel && pip install --no-cache-dir /src/aura.tar.gz
+RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel pyyaml && pip install --no-cache-dir /src/aura.tar.gz
 
 RUN git config --system --add safe.directory '*'
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]