[#37] add support for main in centos:7

Also configure core-dev repo in ubuntu-18.04 Dockerfile so that the new
externals will get picked up.

Author: alanking

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
 *.pyc
+tags

projects/centos-7/Dockerfile

@@ -1,29 +1,31 @@
 FROM centos:7
 
-RUN yum update -y && \
-    yum install -y \
-        which \
-        epel-release \
-        wget \
-        python \
-        python-psutil \
-        python-requests \
-        python-jsonschema \
-        python-pip \
-        rsyslog \
-        gnupg \
-        unixODBC-devel \
-        authd
+RUN \
+  yum update -y && \
+  yum install -y \
+    which \
+    epel-release \
+    wget \
+    gcc-c++ \
+    make \
+    python3 \
+    python3-pip \
+    rsyslog \
+    gnupg \
+    unixODBC-devel \
+    authd
+  #&& \
+  #yum clean all && \
+  #rm -rf /var/cache/yum /tmp/* && \
+
+RUN yum install -y python3-devel
+
+RUN pip3 install xmlrunner distro psutil pyodbc jsonschema requests
 
 RUN rpm --import https://packages.irods.org/irods-signing-key.asc && \
-    wget -qO - https://packages.irods.org/renci-irods.yum.repo | tee /etc/yum.repos.d/renci-irods.yum.repo && \
-    yum update -y
+    wget -qO - https://packages.irods.org/renci-irods.yum.repo | tee /etc/yum.repos.d/renci-irods.yum.repo
 
-# TODO: For some reason, pip does not work from installation above...
-RUN yum install -y \
-        python-pip \
-        sudo \
-    && \
-    pip install xmlrunner
+RUN rpm --import https://core-dev.irods.org/irods-core-dev-signing-key.asc && \
+    wget -qO - https://core-dev.irods.org/renci-irods-core-dev.yum.repo | tee /etc/yum.repos.d/renci-irods-core-dev.yum.repo
 
 ENTRYPOINT ["bash", "-c", "until false; do sleep 2147483647d; done"]

projects/ubuntu-18.04/Dockerfile

@@ -31,7 +31,9 @@ RUN \
 RUN pip3 install xmlrunner distro
 
 RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | apt-key add - && \
-    echo "deb [arch=amd64] https://packages.irods.org/apt/ bionic main" | tee /etc/apt/sources.list.d/renci-irods.list && \
-    apt-get update
+    echo "deb [arch=amd64] https://packages.irods.org/apt/ bionic main" | tee /etc/apt/sources.list.d/renci-irods.list
+
+RUN wget -qO - https://core-dev.irods.org/irods-core-dev-signing-key.asc | apt-key add - && \
+    echo "deb [arch=amd64] https://core-dev.irods.org/apt/ bionic main" | tee /etc/apt/sources.list.d/renci-irods-core-dev.list
 
 ENTRYPOINT ["bash", "-c", "until false; do sleep 2147483647d; done"]