Improvements to docker compose workflow with new packaging changes

This commit is contained in:
Matthew Jones
2016-04-06 12:24:19 -04:00
parent ae9222f716
commit 0a6df40066
5 changed files with 12 additions and 17 deletions

View File

@@ -18,12 +18,12 @@ RUN mkdir -p /data/db
ADD license /etc/awx/license
ADD license /etc/tower/license
RUN pip2 install honcho
RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.0/dumb-init_1.0.0_amd64.deb
RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.1/dumb-init_1.0.1_amd64.deb
RUN dpkg -i dumb-init_*.deb
ADD start_development.sh /start_development.sh
ADD ansible-tower.egg-link /usr/local/lib/python2.7/dist-packages/ansible-tower.egg-link
ADD ansible-tower.egg-link /tmp/ansible-tower.egg-link
ADD tower-manage /usr/local/bin/tower-manage
ADD ansible_tower.egg-info /tmp/ansible_tower.egg-info
RUN ln -s /tower_devel/tools/docker-compose/start_development.sh /start_development.sh
EXPOSE 8013 8080 22
ENTRYPOINT ["/usr/bin/dumb-init"]

View File

@@ -22,14 +22,13 @@ fi
cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true
# Check if we need to build dependencies
if [ -f "awx/lib/.deps_built" ]; then
echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild"
else
make requirements_dev
touch awx/lib/.deps_built
fi
#if [ -f "awx/lib/.deps_built" ]; then
# echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild"
#else
make requirements_dev
# touch awx/lib/.deps_built
#fi
rm -rf /tower_devel/venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link
cp /tmp/ansible-tower.egg-link /tower_devel/venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link
# Tower bootstrapping