diff of awx 6.0.0 to 6.1.0

awx_6.0.0_to_6.1.0.diff

diff --git a/awx/ui/package.json b/awx/ui/package.json
index 5a1bbb8..54df8ad 100644
--- a/awx/ui/package.json
+++ b/awx/ui/package.json
@@ -44,7 +44,7 @@
     "babel-loader": "^7.1.2",
     "babel-plugin-istanbul": "^4.1.5",
     "babel-preset-env": "^1.6.0",
-    "chromedriver": "^2.35.0",
+    "chromedriver": "^2.42.1",
     "clean-webpack-plugin": "^0.1.16",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.5",
diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2
index c281b50..9f12b8d 100644
--- a/installer/roles/image_build/templates/Dockerfile.j2
+++ b/installer/roles/image_build/templates/Dockerfile.j2
@@ -23,7 +23,7 @@ RUN yum -y install acl \
   libcurl-devel \
   libffi-devel \
   libselinux-python \
-  libstdc++.so.6 \
+  libstdc++ \
   libtool-ltdl-devel \
   libxml2-devel \
   libxslt-devel \
@@ -56,7 +56,7 @@ RUN yum -y install acl \
   xmlsec1-openssl-devel \
   yum-utils

-ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
+ADD https://github.com/krallin/tini/releases/download/v0.18.0/tini-arm64 /tini
 RUN chmod +x /tini

 RUN python3 -m ensurepip && pip3 install virtualenv
@@ -71,6 +71,17 @@ ADD requirements/requirements_ansible.txt \
     requirements/requirements_tower_uninstall.txt \
     requirements/requirements_git.txt \
     /tmp/requirements/
+RUN mkdir -p /var/lib/awx/venv && \
+    virtualenv -p python --system-site-packages /var/lib/awx/venv/ansible && \
+    /var/lib/awx/venv/ansible/bin/pip install --ignore-installed six packaging appdirs && \
+    /var/lib/awx/venv/ansible/bin/pip install --ignore-installed setuptools==41.0.1 && \
+    /var/lib/awx/venv/ansible/bin/pip install --ignore-installed pip==19.1.1
+RUN curl -L https://files.pythonhosted.org/packages/ce/3a/3d540b9f5ee8d92ce757eebacf167b9deedb8e30aedec69a2a072b2399bb/bcrypt-3.1.6.tar.gz -O && \
+    tar zxf bcrypt-3.1.6.tar.gz && \
+    cd bcrypt-3.1.6 && \
+    /var/lib/awx/venv/ansible/bin/python setup.py install && \
+    cd .. && \
+    rm -rf bcrypt-3.1.6*
 RUN cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements

 RUN yum -y remove cyrus-sasl-devel \