Skip to content

Commit

Permalink
Merge pull request #17 from TomasTomecek/0.2.0-release
Browse files Browse the repository at this point in the history
0.2.0 release
  • Loading branch information
TomasTomecek authored Nov 8, 2018
2 parents effbe09 + 6d732c9 commit 5fce825
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Renamed to `ansible-bender`, the binary name was left intact.
## Features

* Failed builds are commited as `-failed`.
* The tool tries to find python interpreter inside the base image.
* Added command `list-builds`.
* Added command `get-logs`.
* Added command `inspect`.
Expand All @@ -13,6 +14,7 @@ Renamed to `ansible-bender`, the binary name was left intact.
This means that ab is not able to load such result from cache.
* Caching can be controled by a tag `no-cache` which you can put into a task.
* You can disable layering either by build's option `--no-cache` or adding a tag `stop-Layering` to a task.
* Multiple user experience, output, polish changes.


# 0.1.0
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@ check:
PYTHONPATH=$(CURDIR) pytest-3 -v $(TEST_TARGET)

check-pypi-packaging:
podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:28 bash -c '\
podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:29 bash -c '\
pip3 install . \
&& ab --help \
&& ab build --help'

# check-smoke:
# podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:29 bash -c '\
# dnf install -y buildah podman \
# && podman pull docker.io/library/python:3-alpine \
# && pip3 install . \
# && ab build ./tests/data/basic_playbook.yaml docker.io/library/python:3-alpine test'

check-install-010:
podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:28 bash -c '\
podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:29 bash -c '\
dnf install -y git \
&& pip3 install --user git+https://github.com/TomasTomecek/[email protected] \
&& ab --help \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ because I care about the problem it solves.**
* You can stop creating new image layers by adding tag `stop-layering` to a task.
* If an image build fails, it's comitted and named with a suffix `-failed` (so
you can take a look inside and resolve the issue).
* The tool tries to find python interpreter inside the base image.


## Interface
Expand Down
2 changes: 1 addition & 1 deletion ansible_bender/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.0.dev0"
__version__ = "0.2.0"
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PyYAML
tabulate
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,28 @@

from setuptools import find_packages, setup


def get_requirements():
with open("./requirements.txt") as file:
return file.readlines()

# https://packaging.python.org/guides/single-sourcing-package-version/
version = {}
with open("./ansible_bender/version.py") as fp:
exec(fp.read(), version)

long_description = ''.join(open('README.md').readlines())


setup(
name='ansible-bender',
version=version["__version__"],
description="A tool which builds container images using Ansible playbooks.",
long_description=long_description,
# long_description_content_type='text/markdown',
packages=find_packages(exclude=['tests']),
install_requires=[],
python_requires='>=3.6',
install_requires=get_requirements(),
entry_points='''
[console_scripts]
ab=ansible_bender.cli:main
Expand Down

0 comments on commit 5fce825

Please sign in to comment.