#388 Update base image to Fedora 32
Merged 5 months ago by lholecek. Opened 5 months ago by lholecek.
lholecek/waiverdb f32  into  master

Update base image to Fedora 32
Lukas Holecek • 5 months ago  
file modified
+1 -1
@@ -1,4 +1,4 @@ 

- FROM fedora:29

+ FROM fedora:32

  LABEL \

      name="WaiverDB application" \

      vendor="WaiverDB developers" \

@@ -2,7 +2,7 @@ 

  # https://github.com/jenkinsci/docker-jnlp-slave/blob/master/Dockerfile

  # https://github.com/jenkinsci/docker-slave/blob/master/Dockerfile

  

- FROM fedora:31

+ FROM fedora:32

  LABEL \

      org.opencontainers.image.title="Jenkins agent image for WaiverDB" \

      org.opencontainers.image.description="Jenkins slave for WaiverDB dev tests" \
@@ -14,12 +14,15 @@ 

  ARG HOME_DIR=/home/jenkins

  ARG REMOTING_VERSION=3.36

  ARG TINI_VERSION=0.18.0

- ARG DNF_CMD="dnf -y --setopt=deltarpm=0 --setopt=install_weak_deps=false --setopt=tsflags=nodocs"

  ARG CA_URLS=""

  

  USER root

  

- RUN ${DNF_CMD} install -y \

+ RUN dnf -y \

+     --setopt=deltarpm=0 \

+     --setopt=install_weak_deps=false \

+     --setopt=tsflags=nodocs \

+     install \

      java-1.8.0-openjdk-headless gettext git-core \

      tar gzip skopeo wget make bind-utils \

      origin-clients python3-jinja2-cli \
@@ -40,8 +43,8 @@ 

  # install build dependencies for WaiverDB

  COPY waiverdb.spec /usr/local/src/waiverdb/waiverdb.spec

  RUN cd /usr/local/src/waiverdb \

-   && ${DNF_CMD} builddep waiverdb.spec \

-   && ${DNF_CMD} clean all \

+   && dnf -y builddep waiverdb.spec \

+   && dnf -y clean all \

    && cd / && rm -rf /usr/local/src/waiverdb

  

  # Setup the user for non-arbitrary UIDs with OpenShift
@@ -69,7 +72,7 @@ 

      && chmod +rx /usr/local/bin/tini \

      && curl -L -o /usr/local/bin/wait-for-it "https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh" \

      && chmod +rx /usr/local/bin/tini /usr/local/bin/wait-for-it \

-     && ${DNF_CMD} clean all

+     && dnf -y clean all

  

  # For OpenShift we MUST use the UID of the user and not the name.

  USER ${UID}

@@ -1,4 +1,4 @@ 

- FROM fedora:31

+ FROM fedora:32

  LABEL \

      name="waiverdb" \

      maintainer="WaiverDB developers" \

file modified
+1 -4
@@ -259,10 +259,7 @@ 

      r = client.get('/api/v1.0/waivers/foo')

      assert r.status_code == 404

      res_data = json.loads(r.get_data(as_text=True))

-     message = (

-         'The requested URL was not found on the server.  If you entered the '

-         'URL manually please check your spelling and try again.')

-     assert res_data['message'] == message

+     assert 'The requested URL was not found on the server' in res_data['message']

  

  

  @patch('waiverdb.api_v1.AboutResource.get', side_effect=ConnectionError)

Fixes #387
Signed-off-by: Lukas Holecek hluk@email.cz

rebased onto beed6bc

5 months ago

@mkovarik I've changed the jenkins slave image to use f32 base image and had to remove the DNF_CMD arg to satisfy podman build -- looks it doesn't like "=" characters in the default value.

@mkovarik I've changed the jenkins slave image to use f32 base image and had to remove the DNF_CMD arg to satisfy podman build -- looks it doesn't like "=" characters in the default value.

I do not have any issue with podman build with the DNF_CMD.

Build beed6bc FAILED!
Rebase or make new commits to rebuild.

Build failed due to slow openshift - took 8 minutes to start build...

rebased onto 0553f24

5 months ago

Hmm, I don't see the CI being rerun on repush.

Unfortunately the fedmsg is very unstable since it was replaced by fedora-messaging. So jenkins master is having issue to subscribe. I want to switch to fedora-messaging which is rabbit based but there is a bug in JMS jenkins plugin which I reported and fixed but waiting for merge and new version of the plugin.
https://github.com/jenkinsci/jms-messaging-plugin/issues/200

@mkovarik Got it, thanks for the info. I've restarted the build manually.

@gnaponie, @vmaljulin Please review.

Pull-Request has been merged by lholecek

5 months ago