v2024.01

.dockyman/profiles/local.yaml

@@ -29,11 +29,13 @@ services:
   local:
     environment:
         - DISPLAY=${DISPLAY:?err}
-        - QT_X11_NO_MITSHM=1
         - PULSE_SERVER=unix:${XDG_RUNTIME_DIR:?err}/pulse/native
         - PULSE_COOKIE=/run/pulse/cookie
         - XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:?err}
         - XDG_DATA_DIRS=${XDG_DATA_DIRS:?err}
+        - QT_X11_NO_MITSHM=1
+        - NO_AT_BRIDGE=1
+        - LIBGL_ALWAYS_INDIRECT=1
 
     extends:
       file: gpus.yaml

.gitignore

@@ -0,0 +1,107 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Dockyman logfile 
+lastrun.log
+.env
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/

base/image/.devcontainer.json

@@ -5,8 +5,4 @@
 			"args": { "DOCKER_SRC": "${localEnv:DOCKER_SRC}" }
 	}
 
-	//"features": {
-	//	"ghcr.io/devcontainers/features/go:1": {}
-	//}
-
 }

build.env

@@ -1,7 +1,9 @@
+PROJECT_NAME=ubuntu20.04
 VERSION=v2024.01
 REGISTRY=iitschri
 PROFILE=development
 DOCKYMAN_VER=v1.2
 
-BASE_DOCKER_SRC=ubuntu:20.04
-BASE_NAME=${REGISTRY}/ubuntu20.04-docker:${VERSION}
+PJT_DOCKER_SRC=ubuntu:20.04
+PJT_DOCKER_TAG=${VERSION}
+PJT_DOCKER_NAME=${REGISTRY}/${PROJECT_NAME}-docker:${PJT_DOCKER_TAG}

compose.base.yaml

@@ -33,11 +33,11 @@ services:
       service: dockyman
 
     environment:
-      - DOCKER_SRC=${BASE_DOCKER_SRC}
+      - DOCKER_SRC=${PJT_DOCKER_SRC}
 
-    command: --image_name ${BASE_NAME:?err} --workspace_folder ./base/image
+    command: --image_name ${PJT_DOCKER_NAME:?err} --workspace_folder ./base/image
 
     volumes:
       - type: bind
         source: ./
-        target: /shared
+        target: /shared

compose.local.yaml

@@ -32,4 +32,4 @@ services:
       file: .dockyman/services/dockyman.yaml
       service: dockyman
 
-    command: --image_name ${BASE_NAME:?err} --username docky --groups "sudo,audio,video,input,dialout"
+    command: --image_name ${PJT_DOCKER_NAME:?err} --username docky --groups "sudo,audio,video,input,dialout"

compose.yaml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
 
   main:
-    image: ${BASE_NAME:?err}.local
+    image: ${PJT_DOCKER_NAME:?err}.local
 
     extends:
       file: .dockyman/profiles/local.yaml
@@ -23,4 +23,4 @@ services:
 
       - type: bind
         source: ./scripts
-        target: /var/dockyman/scripts
+        target: /var/dockyman/scripts