Update for python3

Author: Your Name

Dockerfile

@@ -2,42 +2,38 @@ FROM ubuntu:18.04
 
 RUN sed -i s/^deb-src.*// /etc/apt/sources.list
 
-RUN apt-get update && apt-get install --yes sudo python python-pip vim git-core crudini jq && \
-    pip install --upgrade pip && \
+RUN apt-get update && apt-get install --yes sudo python3-dev python3-pip vim git-core crudini jq && \
+    apt clean && \
+    pip3 --no-cache-dir install --upgrade pip setuptools && \
     useradd -u 65500 -m rally && \
     usermod -aG sudo rally && \
-    echo "rally ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/00-rally-user
+    echo "rally ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/00-rally-user && \
+    mkdir /rally && chown -R rally:rally /rally
 
-COPY etc/motd /etc/motd
-WORKDIR /opt/rundeck
-COPY bindep.txt /opt/rundeck/
+RUN pip install git+https://github.com/openstack/rally-openstack.git  --constraint https://raw.githubusercontent.com/openstack/rally-openstack/master/upper-constraints.txt --no-cache-dir && \
+    pip3 install pymysql psycopg2-binary --no-cache-dir
 
-# ensure that we have all system packages installed
-RUN pip install bindep &&  apt-get install --yes $(bindep -b | tr '\n' ' ')
-
-RUN pip install git+https://github.com/openstack/rally-openstack.git  --constraint https://raw.githubusercontent.com/openstack/rally-openstack/master/upper-constraints.txt && \
-    pip install pymysql && \
-    pip install psycopg2 && \
-    mkdir /etc/rally && \
-    echo "[database]" > /etc/rally/rally.conf && \
-    echo "connection=sqlite:////home/rally/data/rally.db" >> /etc/rally/rally.conf
+COPY ./etc/motd_for_docker /etc/motd
 RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' >> /etc/bash.bashrc
-# Cleanup pip
-RUN rm -rf /root/.cache/
-
-# Pre-download tempest to speed up runs
-RUN git clone --bare https://opendev.org/openstack/tempest /opt/tempest
 
 USER rally
 ENV HOME /home/rally
-RUN mkdir -p /home/rally/data && mkdir ~/.rally && cp /etc/rally/rally.conf ~/.rally/ && rally db recreate &&\
-    rally verify create-verifier --name default --type tempest
+RUN mkdir -p /home/rally/.rally
+
+RUN touch ~/.rally/rally.conf
+RUN crudini --set ~/.rally/rally.conf database connection sqlite:////home/rally/.rally/rally.db
+
+RUN rally db recreate
+
+# Docker volumes have specific behavior that allows this construction to work.
+# Data generated during the image creation is copied to volume only when it's
+# attached for the first time (volume initialization)
+RUN rally verify create-verifier --name default --type tempest
 
 COPY bin/rally-verify-wrapper.sh /usr/bin/rally-verify-wrapper.sh
 COPY bin/rally-extract-tests.sh /usr/bin/rally-extract-tests.sh
 
-# Docker volumes have specific behavior that allows this construction to work.
 # Data generated during the image creation is copied to volume only when it's
 # attached for the first time (volume initialization)
-VOLUME ["/home/rally/data"]
-ENTRYPOINT ["rally"]
+VOLUME ["/home/rally/.rally"]
+ENTRYPOINT ["/bin/bash"]

bindep.txt

@@ -3,18 +3,18 @@
 #                                                                             #
 #  WARNING: DO NOT OVERRIDE /home/rally DIRECTORY                             #
 #                                                                             #
-#  /home/rally/data      - a default place with rally database. Use it for    #
+#  /home/rally/.rally      - a default place with rally database. Use it for  #
 #      mounting own directories and synchronizing rally database.             #
-#  /home/rally/source    - a directory with documentation, pre created tasks, #
-#      sampes and source code                                                 #
+#  /rally/source    - a directory with documentation, pre created tasks,      #
+#      samples and source code                                                #
 #  /etc/rally/rally.conf - a default configuration file of rally. To override #
 #      it, mount custom configuration file to /home/rally/.rally/rally.conf   #
 #                                                                             #
 #  Rally at readthedocs - http://rally.readthedocs.org                        #
 #  How to contribute - http://rally.readthedocs.org/en/latest/contribute.html #
 #  If you have any questions, you can reach the Rally team by:                #
 #    * e-mail - [email protected] with tag [Rally] in     #
-#         subject                                                             #
-#    * gitter - https://gitter.im/xRally/Lobby room                           #
+#      subject                                                                #
+#    * Gitter - https://gitter.im/xRally/Lobby room                           #
 #    * irc - "#openstack-rally" channel at freenode.net                       #
 ###############################################################################