docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

convert `/` to `-` in FTL_VERSION so that image name is valid 

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2021-07-04 21:46:45 +01:00
parent 9292d8e58a
commit 918e6b1a21
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.py
View File

@ -29,7 +29,7 @@ def read_pihole_versions():
global FTL_VERSION
dot = os.path.abspath('.')
config = dotenv_values('{}/VERSIONS'.format(dot))
FTL_VERSION = config['FTL_VERSION']
FTL_VERSION = config['FTL_VERSION'].replace('/','-')
def build_dockerfiles(args) -> bool:

4
test/conftest.py
View File

@ -17,7 +17,7 @@ def read_pihole_versions():
global FTL_VERSION
dotdot = os.path.abspath(os.path.join(os.path.abspath(__file__), os.pardir, os.pardir))
config = dotenv_values('{}/VERSIONS'.format(dotdot))
FTL_VERSION = config['FTL_VERSION']
FTL_VERSION = config['FTL_VERSION'].replace('/','-')
@pytest.fixture()
@ -86,7 +86,7 @@ def Docker(request, test_args, args, image, cmd, entrypoint):
def DockerPersist(request, persist_test_args, persist_args, persist_image, persist_cmd, persist_entrypoint, Dig):
''' Persistent Docker container for multiple tests, instead of stopping container after one test '''
''' Uses DUP'd module scoped fixtures because smaller scoped fixtures won't mix with module scope '''
persistent_container = DockerGeneric(request, persist_test_args, persist_args, persist_image, persist_cmd, persist_entrypoint)
persistent_container = DockerGeneric(request, persist_test_args, persist_args, persist_image, persist_cmd, persist_entrypoint)
''' attach a dig conatiner for lookups '''
persistent_container.dig = Dig(persistent_container.id)
return persistent_container