Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pytries/datrie
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: projectcalico/datrie
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 9, 2015

  1. Add docker-base RPM build script.

    Shaun Crampton committed Nov 9, 2015
    Copy the full SHA
    10ef7a6 View commit details

  2. Add bdist_rpm metadata in setup.cfg.

    Shaun Crampton committed Nov 9, 2015
    Copy the full SHA
    9562260 View commit details

Commits on Jul 5, 2016

  1. Fixed Dockerfile so that build works

    @lwr20
    lwr20 authored Jul 5, 2016
    Copy the full SHA
    2c14a66 View commit details

Commits on Jul 6, 2016

  1. Merge pull request #1 from lwr20/patch-1 

    Fixed Dockerfile so that build works
    @fasaxc
    fasaxc authored Jul 6, 2016
    Copy the full SHA
    eeb148b View commit details

Commits on Sep 7, 2016

  1. Use the tigera python builder

    @lwr20
    lwr20 committed Sep 7, 2016
    Copy the full SHA
    c30eff9 View commit details
Showing with 19 additions and 0 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 Dockerfile
  3. +9 −0 build-rpms.sh
  4. +6 −0 setup.cfg
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -5,3 +5,5 @@ src/*.html

*.so
build/
*.egg-info
dist
2 changes: 2 additions & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM calico/centos-python-rpm-builder

9 changes: 9 additions & 0 deletions build-rpms.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env sh
docker build --no-cache=true -t python-rpm-builder .
mkdir -p dist
container=$(docker run -v `pwd`/dist:/rpms -d python-rpm-builder)
echo "Starter build container $container"
docker wait "$container"
echo "Build finished, deleting container and image"
docker rm "$container"
docker rmi python-rpm-builder
6 changes: 6 additions & 0 deletions setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[bdist_rpm]
release = 1
packager = Shaun Crampton <shaun@projectcalico.org>
doc_files = COPYING
README.rst