Skip to content

Commit 5fce825

Browse files
authored
Merge pull request #17 from TomasTomecek/0.2.0-release
0.2.0 release
2 parents effbe09 + 6d732c9 commit 5fce825

File tree

6 files changed

+23
-4
lines changed

6 files changed

+23
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Renamed to `ansible-bender`, the binary name was left intact.
55
## Features
66

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

1719

1820
# 0.1.0

Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@ check:
44
PYTHONPATH=$(CURDIR) pytest-3 -v $(TEST_TARGET)
55

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

12+
# check-smoke:
13+
# podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:29 bash -c '\
14+
# dnf install -y buildah podman \
15+
# && podman pull docker.io/library/python:3-alpine \
16+
# && pip3 install . \
17+
# && ab build ./tests/data/basic_playbook.yaml docker.io/library/python:3-alpine test'
18+
1219
check-install-010:
13-
podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:28 bash -c '\
20+
podman run --rm -ti -v $(CURDIR):/src -w /src registry.fedoraproject.org/fedora:29 bash -c '\
1421
dnf install -y git \
1522
&& pip3 install --user git+https://github.com/TomasTomecek/[email protected] \
1623
&& ab --help \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ because I care about the problem it solves.**
4747
* You can stop creating new image layers by adding tag `stop-layering` to a task.
4848
* If an image build fails, it's comitted and named with a suffix `-failed` (so
4949
you can take a look inside and resolve the issue).
50+
* The tool tries to find python interpreter inside the base image.
5051

5152

5253
## Interface

ansible_bender/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.2.0.dev0"
1+
__version__ = "0.2.0"

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
PyYAML
2+
tabulate

setup.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,28 @@
44

55
from setuptools import find_packages, setup
66

7+
8+
def get_requirements():
9+
with open("./requirements.txt") as file:
10+
return file.readlines()
11+
712
# https://packaging.python.org/guides/single-sourcing-package-version/
813
version = {}
914
with open("./ansible_bender/version.py") as fp:
1015
exec(fp.read(), version)
1116

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

19+
1420
setup(
1521
name='ansible-bender',
1622
version=version["__version__"],
1723
description="A tool which builds container images using Ansible playbooks.",
1824
long_description=long_description,
1925
# long_description_content_type='text/markdown',
2026
packages=find_packages(exclude=['tests']),
21-
install_requires=[],
27+
python_requires='>=3.6',
28+
install_requires=get_requirements(),
2229
entry_points='''
2330
[console_scripts]
2431
ab=ansible_bender.cli:main

0 commit comments

Comments
 (0)