Skip to content

Commit

Permalink
Upgrade the base images to use UBI 8
Browse files Browse the repository at this point in the history
Fedora 30 is not supported anymore and now
that dependencies are installed using PyPi,
the UBI 8 image can be used.
  • Loading branch information
mprahl committed Apr 20, 2021
1 parent d40701b commit 7a8e840
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
9 changes: 3 additions & 6 deletions docker/Dockerfile-api
@@ -1,13 +1,10 @@
FROM fedora:30
FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL maintainer="Factory 2.0"

RUN dnf -y install \
--setopt=deltarpm=0 \
--setopt=install_weak_deps=false \
--setopt=tsflags=nodocs \
RUN microdnf -y install \
bash \
python3-pip \
&& dnf clean all
&& microdnf clean all
# This will allow a non-root user to install a custom root CA at run-time
RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt
WORKDIR /src
Expand Down
9 changes: 3 additions & 6 deletions docker/Dockerfile-scrapers
@@ -1,4 +1,4 @@
FROM fedora:30
FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL maintainer="Factory 2.0"

ENV SCRAPER=all \
Expand All @@ -11,16 +11,13 @@ ENV SCRAPER=all \
WAIT_FOR=0

WORKDIR /src
RUN dnf -y install \
--setopt=deltarpm=0 \
--setopt=install_weak_deps=false \
--setopt=tsflags=nodocs \
RUN microdnf -y install \
bash \
gcc \
libpq-devel \
python3-devel \
python3-pip \
&& dnf clean all
&& microdnf clean all
# This will allow a non-root user to install a custom root CA at run-time
RUN chmod 777 /etc/pki/tls/certs/ca-bundle.crt
COPY . .
Expand Down
10 changes: 3 additions & 7 deletions docker/Dockerfile-tests
@@ -1,14 +1,10 @@
FROM fedora:30
FROM registry.access.redhat.com/ubi8/ubi-minimal

# TODO: Replace the Koji URL once the following is stable https://bodhi.fedoraproject.org/updates/FEDORA-2018-c929a49b1b
RUN dnf -y install \
--setopt=deltarpm=0 \
--setopt=install_weak_deps=false \
--setopt=tsflags=nodocs \
RUN microdnf -y install \
bash \
nmap-ncat \
python3-pip \
&& dnf clean all
&& microdnf clean all

COPY tests/requirements.txt /tmp/requirements.txt
VOLUME /src
Expand Down

0 comments on commit 7a8e840

Please sign in to comment.