mirror of
https://github.com/cmehay/pyentrypoint
synced 2024-10-30 15:21:11 +00:00
Update dependacies and add support for python 3.9 and 3.10
This commit is contained in:
parent
37fd4c7fdc
commit
f351d29121
22
Dockerfile-test.py3.10
Normal file
22
Dockerfile-test.py3.10
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
# Testing with python 3.10
|
||||||
|
|
||||||
|
FROM python:3.10
|
||||||
|
|
||||||
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
|
|
||||||
|
RUN pip install poetry
|
||||||
|
|
||||||
|
RUN adduser --uid 1009 --system testuser
|
||||||
|
RUN addgroup --gid 1010 testgroup
|
||||||
|
|
||||||
|
ENV PYTHONPATH /opt/
|
||||||
|
|
||||||
|
COPY tests/test_template.yml.tpl /tmp/test_template.yml
|
||||||
|
COPY tests/test_template.yml.tpl /tmp/test_template2.yml.tpl
|
||||||
|
COPY pyproject.toml poetry.lock /opt/
|
||||||
|
|
||||||
|
RUN cd /opt && poetry install
|
||||||
|
|
||||||
|
WORKDIR /opt/tests
|
||||||
|
|
||||||
|
CMD ["pytest", "--verbose", "-rw", "."]
|
22
Dockerfile-test.py3.9
Normal file
22
Dockerfile-test.py3.9
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
# Testing with python 3.9
|
||||||
|
|
||||||
|
FROM python:3.9
|
||||||
|
|
||||||
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
|
|
||||||
|
RUN pip install poetry
|
||||||
|
|
||||||
|
RUN adduser --uid 1009 --system testuser
|
||||||
|
RUN addgroup --gid 1010 testgroup
|
||||||
|
|
||||||
|
ENV PYTHONPATH /opt/
|
||||||
|
|
||||||
|
COPY tests/test_template.yml.tpl /tmp/test_template.yml
|
||||||
|
COPY tests/test_template.yml.tpl /tmp/test_template2.yml.tpl
|
||||||
|
COPY pyproject.toml poetry.lock /opt/
|
||||||
|
|
||||||
|
RUN cd /opt && poetry install
|
||||||
|
|
||||||
|
WORKDIR /opt/tests
|
||||||
|
|
||||||
|
CMD ["pytest", "--verbose", "-rw", "."]
|
13
Dockerfile.py3.10
Normal file
13
Dockerfile.py3.10
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
FROM python:3.10
|
||||||
|
|
||||||
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
|
|
||||||
|
ADD . /usr/local/src/
|
||||||
|
|
||||||
|
RUN cd /usr/local/src/ && \
|
||||||
|
pip install --upgrade pip poetry && \
|
||||||
|
poetry install --no-dev
|
||||||
|
|
||||||
|
ONBUILD ADD entrypoint-config.yml .
|
||||||
|
|
||||||
|
ENTRYPOINT ["pyentrypoint"]
|
14
Dockerfile.py3.10-alpine
Normal file
14
Dockerfile.py3.10-alpine
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
FROM python:3.10-alpine
|
||||||
|
|
||||||
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
|
|
||||||
|
ADD . /usr/local/src/
|
||||||
|
|
||||||
|
RUN cd /usr/local/src/ && \
|
||||||
|
apk add gcc && \
|
||||||
|
pip install --upgrade pip poetry && \
|
||||||
|
poetry install --no-dev
|
||||||
|
|
||||||
|
ONBUILD ADD entrypoint-config.yml .
|
||||||
|
|
||||||
|
ENTRYPOINT ["pyentrypoint"]
|
13
Dockerfile.py3.9
Normal file
13
Dockerfile.py3.9
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
FROM python:3.9
|
||||||
|
|
||||||
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
|
|
||||||
|
ADD . /usr/local/src/
|
||||||
|
|
||||||
|
RUN cd /usr/local/src/ && \
|
||||||
|
pip install --upgrade pip poetry && \
|
||||||
|
poetry install --no-dev
|
||||||
|
|
||||||
|
ONBUILD ADD entrypoint-config.yml .
|
||||||
|
|
||||||
|
ENTRYPOINT ["pyentrypoint"]
|
14
Dockerfile.py3.9-alpine
Normal file
14
Dockerfile.py3.9-alpine
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
FROM python:3.9-alpine
|
||||||
|
|
||||||
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
|
|
||||||
|
ADD . /usr/local/src/
|
||||||
|
|
||||||
|
RUN cd /usr/local/src/ && \
|
||||||
|
apk add gcc && \
|
||||||
|
pip install --upgrade pip poetry && \
|
||||||
|
poetry install --no-dev
|
||||||
|
|
||||||
|
ONBUILD ADD entrypoint-config.yml .
|
||||||
|
|
||||||
|
ENTRYPOINT ["pyentrypoint"]
|
14
Makefile
14
Makefile
@ -6,17 +6,17 @@ build:
|
|||||||
clean:
|
clean:
|
||||||
docker-compose down --remove-orphans
|
docker-compose down --remove-orphans
|
||||||
|
|
||||||
test: build test-python3.6 test-python3.7 test-python3.8 clean
|
test: build test-python3.8 test-python3.9 test-python3.10 clean
|
||||||
|
|
||||||
test-python3.6:
|
|
||||||
@docker-compose run --rm testpython3.6
|
|
||||||
|
|
||||||
test-python3.7:
|
|
||||||
@docker-compose run --rm testpython3.7
|
|
||||||
|
|
||||||
test-python3.8:
|
test-python3.8:
|
||||||
@docker-compose run --rm testpython3.8
|
@docker-compose run --rm testpython3.8
|
||||||
|
|
||||||
|
test-python3.9:
|
||||||
|
@docker-compose run --rm testpython3.9
|
||||||
|
|
||||||
|
test-python3.10:
|
||||||
|
@docker-compose run --rm testpython3.10
|
||||||
|
|
||||||
test-python3:
|
test-python3:
|
||||||
@docker-compose run --rm testpython3
|
@docker-compose run --rm testpython3
|
||||||
|
|
||||||
|
@ -13,36 +13,6 @@ testpython3:
|
|||||||
file: common.yml
|
file: common.yml
|
||||||
service: environ
|
service: environ
|
||||||
|
|
||||||
testpython3.6:
|
|
||||||
build: .
|
|
||||||
dockerfile: Dockerfile-test.py3.6
|
|
||||||
volumes:
|
|
||||||
- ./pyentrypoint:/opt/pyentrypoint:ro
|
|
||||||
- ./tests:/opt/tests
|
|
||||||
links:
|
|
||||||
- test1
|
|
||||||
- test2
|
|
||||||
- test3
|
|
||||||
- test4
|
|
||||||
extends:
|
|
||||||
file: common.yml
|
|
||||||
service: environ
|
|
||||||
|
|
||||||
testpython3.7:
|
|
||||||
build: .
|
|
||||||
dockerfile: Dockerfile-test.py3.7
|
|
||||||
volumes:
|
|
||||||
- ./pyentrypoint:/opt/pyentrypoint:ro
|
|
||||||
- ./tests:/opt/tests
|
|
||||||
links:
|
|
||||||
- test1
|
|
||||||
- test2
|
|
||||||
- test3
|
|
||||||
- test4
|
|
||||||
extends:
|
|
||||||
file: common.yml
|
|
||||||
service: environ
|
|
||||||
|
|
||||||
testpython3.8:
|
testpython3.8:
|
||||||
build: .
|
build: .
|
||||||
dockerfile: Dockerfile-test.py3.8
|
dockerfile: Dockerfile-test.py3.8
|
||||||
@ -58,6 +28,38 @@ testpython3.8:
|
|||||||
file: common.yml
|
file: common.yml
|
||||||
service: environ
|
service: environ
|
||||||
|
|
||||||
|
testpython3.9:
|
||||||
|
build: .
|
||||||
|
dockerfile: Dockerfile-test.py3.9
|
||||||
|
volumes:
|
||||||
|
- ./pyentrypoint:/opt/pyentrypoint:ro
|
||||||
|
- ./tests:/opt/tests
|
||||||
|
links:
|
||||||
|
- test1
|
||||||
|
- test2
|
||||||
|
- test3
|
||||||
|
- test4
|
||||||
|
extends:
|
||||||
|
file: common.yml
|
||||||
|
service: environ
|
||||||
|
|
||||||
|
|
||||||
|
testpython3.10:
|
||||||
|
build: .
|
||||||
|
dockerfile: Dockerfile-test.py3.10
|
||||||
|
volumes:
|
||||||
|
- ./pyentrypoint:/opt/pyentrypoint:ro
|
||||||
|
- ./tests:/opt/tests
|
||||||
|
links:
|
||||||
|
- test1
|
||||||
|
- test2
|
||||||
|
- test3
|
||||||
|
- test4
|
||||||
|
extends:
|
||||||
|
file: common.yml
|
||||||
|
service: environ
|
||||||
|
|
||||||
|
|
||||||
test1:
|
test1:
|
||||||
image: busybox
|
image: busybox
|
||||||
command: sleep 30
|
command: sleep 30
|
||||||
|
1136
poetry.lock
generated
1136
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
[tool]
|
[tool]
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "pyentrypoint"
|
name = "pyentrypoint"
|
||||||
version = "0.7.4"
|
version = "0.8.0"
|
||||||
description = "pyentrypoint manages entrypoints in Docker containers."
|
description = "pyentrypoint manages entrypoints in Docker containers."
|
||||||
license = "WTFPL"
|
license = "WTFPL"
|
||||||
classifiers = ["Programming Language :: Python", "Development Status :: 1 - Planning", "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.6", "Topic :: System :: Installation/Setup"]
|
classifiers = ["Programming Language :: Python", "Development Status :: 1 - Planning", "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.6", "Topic :: System :: Installation/Setup"]
|
||||||
@ -10,20 +10,20 @@ authors = ["Christophe Mehay <cmehay@nospam.student.42.fr>"]
|
|||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.6.1"
|
python = ">= 3.8.0, < 3.11"
|
||||||
colorlog = "^4.1"
|
colorlog = "*"
|
||||||
jinja2 = "^2.11"
|
jinja2 = "*"
|
||||||
pyyaml = "^5.3"
|
pyyaml = "*"
|
||||||
six = "^1.14"
|
six = "*"
|
||||||
watchdog = "^0.10"
|
watchdog = "^0.10"
|
||||||
toml = "^0.10.1"
|
toml = "*"
|
||||||
|
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.dev-dependencies]
|
||||||
docker-compose = "^1.25.5"
|
docker-compose = "*"
|
||||||
pytest = "^5.4.2"
|
pytest = "*"
|
||||||
pytest-mock = "^3.1.0"
|
pytest-mock = "*"
|
||||||
pre-commit = "^2.3.0"
|
pre-commit = "*"
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry>=1.0.8"]
|
requires = ["poetry>=1.0.8"]
|
||||||
|
Loading…
Reference in New Issue
Block a user