Merge pull request #1044 from jpopelka/update-image

[Dockerfile(s)] FROM fedora:31 -> usercont/base

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

Dockerfile

@@ -1,26 +1,19 @@
 # pip3 install packit from this repo.
-# Base image for packit-service-worker
 
-FROM fedora:31
+FROM docker.io/usercont/base
 
-ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \
-    ANSIBLE_STDOUT_CALLBACK=debug \
-    WORKDIR=/src
+WORKDIR /src
 
-WORKDIR ${WORKDIR}
-
-RUN dnf -y install ansible
-
-COPY files/tasks/*.yaml ${WORKDIR}/files/tasks/
-COPY files/install-build-deps.yaml ${WORKDIR}/files/
-COPY *.spec ${WORKDIR}/
-RUN ansible-playbook -v -c local -i localhost, ${WORKDIR}/files/install-build-deps.yaml \
+COPY files/tasks/*.yaml files/tasks/
+COPY files/install-build-deps.yaml files/
+COPY *.spec ./
+RUN ansible-playbook -v -c local -i localhost, files/install-build-deps.yaml \
     && dnf clean all
 
-COPY ./ ${WORKDIR}/
-RUN pip3 install ${WORKDIR}/ \
-    && cd ${WORKDIR} && git rev-parse HEAD >/.packit.git.commit.hash \
+COPY ./ ./
+RUN pip3 install ./ \
+    && git rev-parse HEAD >/.packit.git.commit.hash \
     && git show --quiet --format=%B HEAD >/.packit.git.commit.message \
     && rm -rf ~/.cache/*
 
-RUN cd / && rm -rf ${WORKDIR}/ && mkdir ${WORKDIR}/
+RUN cd / && rm -rf /src && mkdir /src

Dockerfile.tests

@@ -1,12 +1,7 @@
 # Packit (test) dependencies.
 # To run tests locally via 'make check_in_container'.
 
-FROM fedora:31
-
-RUN dnf -y install ansible
-
-ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \
-    ANSIBLE_STDOUT_CALLBACK=debug
+FROM docker.io/usercont/base
 
 COPY files/tasks/*.yaml /files/tasks/
 COPY files/*.yaml /files/