From 641639b5b21ff548167060073331faea3bf15634 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 21 Nov 2016 09:44:17 -0500 Subject: [PATCH] Remove this dockerfile stuff. It isn't actually used by Jenkins, and is therefore confusing. Fixes #182. --- jenkins-check-Dockerfile | 42 ---------------------------------------- jenkins-check.sh | 4 ---- 2 files changed, 46 deletions(-) delete mode 100644 jenkins-check-Dockerfile delete mode 100755 jenkins-check.sh diff --git a/jenkins-check-Dockerfile b/jenkins-check-Dockerfile deleted file mode 100644 index debe3491..00000000 --- a/jenkins-check-Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# This is what jenkins uses to check, roughly -# Those parts starting with `###' were taken from Dockerfile just for some -# overview on what's happening there. - -FROM fedora:24 - -# so we don't have to compile those when fetched from PyPI -RUN dnf install -y \ - python \ - python-virtualenv \ - python-devel \ - libffi-devel \ - redhat-rpm-config \ - openssl-devel \ - gcc \ - gcc-c++ \ - koji \ - git \ - swig \ - && dnf autoremove -y \ - && dnf clean all \ - && mkdir /opt/module_build_service/ \ - && mkdir /etc/module_build_service -WORKDIR /opt/module_build_service/ -COPY ./requirements.txt /opt/module_build_service/ -RUN pip install --user -r ./requirements.txt - -RUN ln -s /opt/module_build_service/koji.conf /etc/module_build_service/koji.conf -### && ln -s /opt/module_build_service/copr.conf /etc/module_build_service/copr.conf \ -### && ln -s /opt/module_build_service/krb5-stg.fp.o /etc/krb5.conf.d/stg_fedoraproject_org - -# This isn't what we do in jenkins, blah ... -# RUN pip install --upgrade -r test-requirements.txt - -RUN pip install --upgrade mock - -# Need to force reinstall so nose gets the virtualenv modules. -RUN pip install nose --ignore-installed - -COPY . /opt/module_build_service/ - -CMD ["nosetests", "."] diff --git a/jenkins-check.sh b/jenkins-check.sh deleted file mode 100755 index 044ef539..00000000 --- a/jenkins-check.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -e - -sudo docker build -f jenkins-check-Dockerfile -t module_build_service/jenkins-check-24 . -sudo docker run module_build_service/jenkins-check-24