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

consistent global version var 

Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2019-01-21 00:09:05 -06:00
parent 440a7a19a5
commit 08c2ac2e48
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.py
View File

@ -35,13 +35,13 @@ os_base_vars = {
'php_error_log': '/var/log/lighttpd/error.log' 'php_error_log': '/var/log/lighttpd/error.log'
} }
__version = None __version__ = None
dot = os.path.abspath('.') dot = os.path.abspath('.')
with open('{}/VERSION'.format(dot), 'r') as v: with open('{}/VERSION'.format(dot), 'r') as v:
__version = v.read().strip() __version__ = v.read().strip()
images = { images = {
__version: [ __version__: [
{ {
'base': 'pihole/debian-base:latest', 'base': 'pihole/debian-base:latest',
'arch': 'amd64' 'arch': 'amd64'
@ -108,7 +108,7 @@ def build(docker_repo, arch, args):
).get_module("Command").run ).get_module("Command").run
dockerfile = 'Dockerfile_{}'.format(arch) dockerfile = 'Dockerfile_{}'.format(arch)
repo_tag = '{}:{}_{}'.format(docker_repo, __version, arch) repo_tag = '{}:{}_{}'.format(docker_repo, __version__, arch)
cached_image = '{}/{}'.format('pihole', repo_tag) cached_image = '{}/{}'.format('pihole', repo_tag)
time='' time=''
if args['-t']: if args['-t']: