diff --git a/docker/ploughshares/Dockerfile b/docker/ploughshares/Dockerfile index b185088..d7919e0 100644 --- a/docker/ploughshares/Dockerfile +++ b/docker/ploughshares/Dockerfile @@ -14,10 +14,16 @@ RUN apt-get update && apt-get install -y \ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt +# Copy VERSION file +COPY ../VERSION ./VERSION +ARG APP_VERSION=unknown +ENV APP_VERSION=${APP_VERSION} + # Copy application code COPY app.py . COPY schema.sql . COPY templates/ ./templates/ +COPY static/ ./static/ # Tests directory is empty or doesn't contain required files # COPY tests/ ./tests/ diff --git a/docker/ploughshares/app.py b/docker/ploughshares/app.py index b7c8aec..a3c634e 100644 --- a/docker/ploughshares/app.py +++ b/docker/ploughshares/app.py @@ -18,8 +18,14 @@ logger = logging.getLogger('ploughshares') VERSION = os.environ.get('APP_VERSION') if not VERSION: try: - with open(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'VERSION'), 'r') as f: - VERSION = f.read().strip() + # Try to read from VERSION file in the current directory first + if os.path.exists('VERSION'): + with open('VERSION', 'r') as f: + VERSION = f.read().strip() + # Fall back to the project root VERSION file + else: + with open(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'VERSION'), 'r') as f: + VERSION = f.read().strip() except: VERSION = "unknown" diff --git a/docker/ploughshares/static/favicon.ico b/docker/ploughshares/static/favicon.ico new file mode 100644 index 0000000..53ada59 --- /dev/null +++ b/docker/ploughshares/static/favicon.ico @@ -0,0 +1,7 @@ + +404 Not Found + +

404 Not Found

+
nginx
+ + diff --git a/docker/ploughshares/templates/base.html b/docker/ploughshares/templates/base.html index e83d943..9253af7 100644 --- a/docker/ploughshares/templates/base.html +++ b/docker/ploughshares/templates/base.html @@ -4,6 +4,7 @@ {% block title %}Project Ploughshares - Transaction Management System{% endblock %} + @@ -68,7 +75,7 @@