Update

.github/workflows/docker-build-model.yaml

@@ -8,14 +8,14 @@ on:
       - 'main'
     # only build when important files change
     paths:
-      - 'model/**'
+      - 'src/model/**'
       - '.github/workflows/call-docker-build-model.yaml'
   pull_request:
     branches:
       - 'main'
     # only build when important files change
     paths:
-      - 'model/**'
+      - 'src/model/**'
       - '.github/workflows/call-docker-build-model.yaml'
 
 env:

.github/workflows/docker-build-web.yaml

@@ -1,28 +1,25 @@
 name: Build Web
-# template source: https://github.com/dockersamples/.github/blob/main/templates/call-docker-build.yaml
 
 on:
   # we want pull requests so we can build(test) but not push to image registry
   push:
     branches:
       - 'main'
-    # only build when important files change
     paths:
-      - 'frontend/**'
+      - 'src/frontend/**'
       - '.github/workflows/call-docker-build-web.yaml'
   pull_request:
     branches:
       - 'main'
     # only build when important files change
     paths:
-      - 'frontend/**'
+      - 'src/frontend/**'
       - '.github/workflows/call-docker-build-web.yaml'
 
 jobs:
   call-docker-build:
 
     name: Web Call Docker Build
-
     uses: dockersamples/.github/.github/workflows/reusable-docker-build.yaml@main
 
     permissions:

Makefile

@@ -1,5 +1,7 @@
 MAKEFLAGS += --silent
 
+BASEDIR=$(shell git rev-parse --show-toplevel)
+
 APP ?= web
 
 .PHONY: test healthcheck clean
@@ -17,7 +19,7 @@ healthcheck:
 	docker inspect $(APP) --format "{{ (index (.State.Health.Log) 0).Output }}"
 
 clean:
-	rm -rf model/*.pkl *.pkl
+	rm -rf ${BASEDIR}/src/model/*.pkl *.pkl
 	docker-compose down --volumes --remove-orphans -v
 
 -include include.mk

compose.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   web:
     build:
-      context: frontend
+      context: src/frontend
     container_name: web
     environment:
       - PORT=5000
@@ -24,7 +24,7 @@ services:
       start_period: 3s
   model:
     build:
-      context: model
+      context: src/model
     command:
       - /prices.csv
     container_name: model
@@ -35,7 +35,7 @@ services:
       - MODEL_FILE=/data/model.pkl
   test:
     build:
-      context: test-client
+      context: src/client
     container_name: test
     environment:
       - API_URL=http://web:5000/api

healthchecks/ping.py

@@ -3,16 +3,15 @@
 import argparse
 import socket
 import urllib.request
-from datetime import datetime
 
 parser = argparse.ArgumentParser()
 parser.add_argument("url", type=str, help="Url to ping.")
 
 
 def main(args):
     try:
-        with urllib.request.urlopen(args.url, timeout=10) as _:
-            print(datetime.now())
+        with urllib.request.urlopen(args.url, timeout=10) as res:
+            print(res.read())
     except socket.error as error_:
         print(f"Ping failed: {error_}")
 

frontend/Dockerfile → src/frontend/Dockerfile

@@ -1,5 +1,6 @@
 FROM python:3.11-slim-buster
 LABEL org.opencontainers.image.description="Flask API with ML prediction"
+LABEL maintainer="Admir Trakic <[email protected]>"
 
 # Keeps Python from generating .pyc files in the container
 ENV PYTHONDONTWRITEBYTECODE=1
@@ -11,7 +12,7 @@ COPY requirements.txt .
 RUN python -m pip install -r requirements.txt
 
 WORKDIR /app
-COPY ./src .
+COPY . .
 
 RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
 USER appuser

model/Dockerfile → src/model/Dockerfile

@@ -11,6 +11,7 @@ RUN /venv/bin/pip install --disable-pip-version-check -r /requirements.txt
 
 FROM gcr.io/distroless/python3-debian11 as final
 LABEL org.opencontainers.image.description="Machine Learning model to predict house prices"
+LABEL maintainer="Admir Trakic <[email protected]>"
 COPY --from=build-venv /venv /venv
 WORKDIR /app
 COPY . .