Improved scripts

Dockerfile

@@ -1,11 +1,18 @@
-FROM python:3.11
+FROM ghcr.io/ad-sdl/wei
 
-RUN mkdir -p /webcam_module
+LABEL org.opencontainers.image.source=https://github.com/AD-SDL/webcam_module
+LABEL org.opencontainers.image.description="An example module that implements a simple webcam snapshot action"
+LABEL org.opencontainers.image.licenses=MIT
 
-COPY ./src /webcam_module/src
-COPY ./README.md /webcam_module/README.md
-COPY ./pyproject.toml /webcam_module/pyproject.toml
+USER wei
+WORKDIR /home/wei
+
+RUN mkdir -p webcam_module
+
+COPY --chown=wei:wei ./src webcam_module/src
+COPY --chown=wei:wei ./README.md webcam_module/README.md
+COPY --chown=wei:wei ./pyproject.toml webcam_module/pyproject.toml
 
 RUN pip install ./webcam_module
 
-CMD ["python", "/webcam_module/src/webcam_rest_node.py"]
+CMD ["python", "webcam_module/src/webcam_rest_node.py"]

compose.yaml

@@ -2,7 +2,7 @@ version: "3.0"
 name: webcam_module
 services:
   webcam_node:
-    image: webcam_module
+    image: ghcr.io/ad-sdl/webcam_module
     build:
       context: .
       dockerfile: Dockerfile

scripts/build.sh

@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
 
-version=`$SCRIPTPATH/version.sh`
-name=`$SCRIPTPATH/name.sh`
-
-cd $SCRIPTPATH/..
+cd $project_path
 
 docker build \
-	-t ghcr.io/ad-sdl/${name}:${version} \
-	-t ghcr.io/ad-sdl/${name}:dev \
+	-t ghcr.io/ad-sdl/${project_name}:${project_version} \
+	-t ghcr.io/ad-sdl/${project_name}:dev \
+	-t ghcr.io/ad-sdl/${project_name}:latest \
 	.

scripts/logs.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
+cd $project_path
+
+docker compose logs "$@"

scripts/publish.sh

@@ -1,8 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
 
-version=`$SCRIPTPATH/version.sh`
-name=`$SCRIPTPATH/name.sh`
+$scripts_path/build.sh
 
-docker push ghcr.io/ad-sdl/${name}:${version}
+docker push ghcr.io/ad-sdl/${project_name}:${project_version}

scripts/restart.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
+cd $project_path
+
+docker compose restart

scripts/script_helper.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Invoke this helper from other scripts in the scripts dir of a project with:
+# source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
+
+USER_ID=$(id -u)
+GROUP_ID=$(id -g)
+
+scripts_path="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+cd $scripts_path
+project_path=`git rev-parse --show-toplevel`
+if [[ -f ${project_path}/pyproject.toml ]]; then
+	project_name=`grep -oP '(?<=name = ")[^"]+' $project_path/pyproject.toml | head -n 1`
+	project_version=`grep -oP '(?<=version = ")[^"]+' $project_path/pyproject.toml | head -n 1`
+else
+	project_name=`basename $project_path`
+	project_version="0.0.0"
+fi
+

scripts/start.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
+cd $project_path
+
+docker compose up "$@"

scripts/stop.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"/script_helper.sh
+cd $project_path
+
+docker compose down