Fix img assets missing in docker
This commit is contained in:
parent
3bbe0f20ea
commit
3aa2264be4
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
@ -264,7 +264,7 @@ class ThumbnailView(object):
|
||||||
if thumb_path:
|
if thumb_path:
|
||||||
return cherrypy.lib.static.serve_file(thumb_path, "image/jpeg")
|
return cherrypy.lib.static.serve_file(thumb_path, "image/jpeg")
|
||||||
else:
|
else:
|
||||||
return cherrypy.lib.static.serve_file(os.path.join(APPROOT, "styles/dist/unknown.svg"), "image/svg+xml")
|
return cherrypy.lib.static.serve_file(os.path.join(APPROOT, "assets/img/unknown.svg"), "image/svg+xml")
|
||||||
|
|
||||||
|
|
||||||
@cherrypy.popargs('item_type', 'uuid')
|
@cherrypy.popargs('item_type', 'uuid')
|
||||||
|
|
|
@ -22,8 +22,8 @@ def get_engine_options(uri):
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
|
|
||||||
def get_db_engine(uri):
|
def get_db_engine(uri, debug=False):
|
||||||
engine = sqlalchemy.create_engine(uri, **get_engine_options(uri))
|
engine = sqlalchemy.create_engine(uri, **get_engine_options(uri), echo=debug)
|
||||||
Base.metadata.create_all(engine)
|
Base.metadata.create_all(engine)
|
||||||
return engine
|
return engine
|
||||||
|
|
||||||
|
|
5
setup.py
5
setup.py
|
@ -22,11 +22,12 @@ setup(name='photoapp',
|
||||||
"photocli = photoapp.cli:main",
|
"photocli = photoapp.cli:main",
|
||||||
# "photoimport = photoapp.ingest:main", # broken for now
|
# "photoimport = photoapp.ingest:main", # broken for now
|
||||||
# "photovalidate = photoapp.validate:main",
|
# "photovalidate = photoapp.validate:main",
|
||||||
#"photooffset = photoapp.dateoffset:main",
|
# "photooffset = photoapp.dateoffset:main",
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
package_data={'photoapp': ['../templates/*.html',
|
package_data={'photoapp': ['../templates/*.html',
|
||||||
'../templates/fragments/*.html',
|
'../templates/fragments/*.html',
|
||||||
'../styles/dist/*']},
|
'../styles/dist/*',
|
||||||
|
'../assets/img/*']},
|
||||||
zip_safe=False)
|
zip_safe=False)
|
||||||
|
|
Loading…
Reference in New Issue