Skip to content

Commit

Permalink
Fix debian building
Browse files Browse the repository at this point in the history
  • Loading branch information
solarkennedy committed Jan 23, 2015
1 parent aeb8396 commit 5cb1da2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist/
*.py?
.*.swp
paasta_tools.egg-info/
debian/paasta-tools/
1 change: 0 additions & 1 deletion debian/files

This file was deleted.

13 changes: 13 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,18 @@ export DH_OPTIONS
%:
dh $@ --with python-virtualenv

# do not call `make clean` as part of packaging
override_dh_auto_clean:
true

# do not call `make` as part of packaging
override_dh_auto_build:
true

# do not call `make test` as part of packaging
override_dh_auto_test:
true


override_dh_virtualenv:
dh_virtualenv --pypi-url='http://pypi.yelpcorp.com/simple' --python=/usr/bin/python2.7
16 changes: 8 additions & 8 deletions yelp_package/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ SHELL=/bin/bash

UID:=`id -u`
GID:=`id -g`
DOCKER_RUN_LUCID:=docker run -t -v $(CURDIR):/work:rw soatools_lucid_container
DOCKER_RUN_TRUSTY:=docker run -t -v $(CURDIR):/work:rw soatools_trusty_container
DOCKER_RUN_CHRONOS:=docker run -t -i --link=chronos_itest_chronos:chronos -v $(CURDIR):/work:rw chronos_itest/itest
DOCKER_QUICK_START:=docker run -t -i -v $(CURDIR):/work:rw soatools_lucid_container
DOCKER_RUN_LUCID:=docker run -t -v $(CURDIR)/../:/work:rw soatools_lucid_container
DOCKER_RUN_TRUSTY:=docker run -t -v $(CURDIR)/../:/work:rw soatools_trusty_container
DOCKER_RUN_CHRONOS:=docker run -t -i --link=chronos_itest_chronos:chronos -v $(CURDIR)/../:/work:rw chronos_itest/itest
DOCKER_QUICK_START:=docker run -t -i -v $(CURDIR)/../:/work:rw soatools_lucid_container

itest_lucid: package_lucid
$(DOCKER_RUN_LUCID) /work/itest/ubuntu.sh

package_lucid: build_lucid_docker
$(DOCKER_RUN_LUCID) /bin/bash -c "cd src && dpkg-buildpackage -d && mv ../*.deb ../dist/"
$(DOCKER_RUN_LUCID) /bin/bash -c "dpkg-buildpackage -d && mv ../*.deb dist/"
$(DOCKER_RUN_LUCID) chown -R $(UID):$(GID) /work


build_lucid_docker:
[ -d dist ] || mkdir dist
[ -d ../dist ] || mkdir ../dist
cd dockerfiles/lucid/ && docker build -t "soatools_lucid_container" .

itest_trusty: package_trusty
$(DOCKER_RUN_TRUSTY) /work/itest/ubuntu.sh

package_trusty: test build_trusty_docker
$(DOCKER_RUN_TRUSTY) /bin/bash -c "cd src && dpkg-buildpackage -d && mv ../*.deb ../dist/"
$(DOCKER_RUN_TRUSTY) /bin/bash -c "dpkg-buildpackage -d && mv ../*.deb dist/"
$(DOCKER_RUN_TRUSTY) chown -R $(UID):$(GID) /work

build_trusty_docker:
[ -d dist ] || mkdir dist
[ -d ../dist ] || mkdir ../dist
cd dockerfiles/trusty/ && docker build -t "soatools_trusty_container" .

quick_start:
Expand Down

0 comments on commit 5cb1da2

Please sign in to comment.