Skip to content

Commit

Permalink
Merge branch 'master' into stdin
Browse files Browse the repository at this point in the history
  • Loading branch information
lavie committed Jun 16, 2021
2 parents d4fdd70 + 6da5ca4 commit dcdc43b
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 334 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ rebuild:
docker tag assaflavie/runlike assaflavie/runlike:$(CUR_VER)

.PHONY: push
push: build
push: rebuild
docker push assaflavie/runlike
docker push assaflavie/runlike:$(CUR_VER)

.PHONY: test
test:
pipenv run pytest
poetry run pytest

.PHONY: pypi
pypi:
Expand Down
16 changes: 0 additions & 16 deletions Pipfile

This file was deleted.

259 changes: 0 additions & 259 deletions Pipfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion dockerfiles/sleep.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

sleep 10
sleep 1000
1 change: 1 addition & 0 deletions fixtures.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ sudocker rm -f runlike_fixture1
sudocker run -d --name runlike_fixture1 \
--hostname Essos \
--expose 1000 \
--expose 1000/udp \
--privileged \
--cap-add=CHOWN \
-p 400:400 \
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "runlike"
version = "1.0.0"
version = "1.0.3"
description = "Reverse-engineer docker run command line arguments based on running containers"
authors = ["Assaf Lavie <a@assaflavie.com>"]
license = "MIT"
Expand All @@ -15,6 +15,9 @@ pytest = "^6.2.4"
wheel = "^0.36.2"
toml = "^0.10.2"

[tool.poetry.scripts]
runlike = 'runlike.runlike:main'

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
Loading

0 comments on commit dcdc43b

Please sign in to comment.