revision

.devcontainer/Dockerfile

@@ -0,0 +1,7 @@
+FROM duplicati/duplicati
+
+RUN apt update && \
+apt install -y default-mysql-client && \ 
+rm -rf /var/lib/apt/lists/*
+
+EXPOSE 8200

.devcontainer/devcontainer.json

@@ -0,0 +1,38 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+	"name": "duplicati_dev-container",
+	"build": {
+        // Path is relative to the devcontainer.json file.
+        "dockerfile": "Dockerfile"
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/git:1": {
+			"ppa": true,
+			"version": "latest"
+		},
+		"ghcr.io/prulloac/devcontainer-features/gitlint:1": {}
+	},
+	"containerEnv": {}
+	
+	//"features": {
+	//	"ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {},
+	//	"ghcr.io/wxw-matt/devcontainer-features/script_runner:0": {},
+//		"ghcr.io/devcontainers-extra/features/act:1": {}
+//	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.gitea/workflows/docker-image.deploy.yml

@@ -1,7 +1,7 @@
 on: 
   push:
     paths:
-      - "docker/mysqlclient/**"
+      - "docker/**"
       - ".gitea/**"
       - "scripts/**"
 jobs:
@@ -26,6 +26,6 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: ${{gitea.workspace}}
-          file: ${{gitea.workspace}}/docker/mysqlclient/Dockerfile
+          file: ${{gitea.workspace}}/docker/Dockerfile
           push: true
-          tags: git.limbosolutions.com/kb/duplicati:mysql-latest
+          tags: git.limbosolutions.com/kb/duplicati:latest

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly

.vscode/settings.json

@@ -1,3 +1,19 @@
 {
-    "docker.commands.build": "${containerCommand} build --pull --rm -f \"${dockerfile}\" -t ${tag} . --progress=plain"
-}
+    "docker.commands.composeUpSubset": [
+
+        {
+            "label": "Compose Up",
+            "template": "${composeCommand} ${profileList} ${configurationFile} up ${detached} ${build} ${serviceList}"
+        }
+    ],
+    "docker.commands.composeUp": [
+
+        {
+            "label": "Compose Up",
+            "template": "${composeCommand} ${configurationFile} up ${detached} ${build}"
+        }
+    ],
+    "docker.contexts.showInStatusBar": true
+} // {
+//     "docker.commands.build": "${containerCommand} build --pull --rm -f \"${dockerfile}\" -t ${tag} . --progress=plain"
+// }

README.md

@@ -3,7 +3,7 @@
 - [Docker](#docker)
   - [Duplicati/mySql Client - image](#duplicatimysql-client---image)
 - [Scripts](#scripts)
-  - [Backup mySql Database](#backup-mysql-database)
+  - [mysql - dump backup](#mysql---dump-backup)
   - [Influxdb Reporting](#influxdb-reporting)
   - [Docker log](#docker-log)
   - [Environment Variables](#environment-variables)
@@ -20,23 +20,17 @@
 
 Image contains all scripts
 
-[+ Information](docker/mysqlclient/README.md)
+[+ Information](docker/README.md)
 
 ## Scripts
 
-_Source: https://github.com/duplicati/duplicati/blob/master/Duplicati/Library/Modules/Builtin/run-script-example.sh_
+Source: <https://github.com/duplicati/duplicati/blob/master/Duplicati/Library/Modules/Builtin/run-script-example.sh>
 
-### Backup mySql Database
+### mysql - dump backup
 
-Using option run-script-before-required on duplicati job set value to [script](scripts/duplicati-mysql-backup).
-And job will create a database dump configured using environment variables.
-Example:  
---run-script-after=/duplicati-mysql-backup
-
-[script](scripts/duplicati-mysql-backup)
+Duplicati options set `run-script-before-required`  to [duplicati-mysql-backup](scripts/duplicati-mysql-backup).
 
 ```bash
-#/etc/default/duplicati-mysql 
 MYSQL_HOST="mysqlserver"
 MYSQL_USER="msqluser"
 MYSQL_PASSWORD="msqlpassord"
@@ -63,14 +57,13 @@ Example:
 
 ### Docker log
 
-
 Add [script](docker/scripts/dockerlog) to default settings.  
 Example:  
 --run-script-after=dockerlog
 
 ### Environment Variables
 
-Source: https://github.com/duplicati/duplicati/blob/master/Duplicati/Library/Modules/Builtin/run-script-example.sh_
+Source: <https://github.com/duplicati/duplicati/blob/master/Duplicati/Library/Modules/Builtin/run-script-example.sh>_
 
 - DUPLICATI__EVENTNAME
   

docker/Dockerfile

@@ -0,0 +1,17 @@
+FROM duplicati/duplicati
+RUN apt update && \
+apt install -y default-mysql-client && \ 
+rm -rf /var/lib/apt/lists/*
+
+#repo root scripts
+COPY /docker/scripts /usr/local/bin
+
+#docker scripts
+COPY ./scripts /usr/local/bin
+
+RUN \
+chmod +x /usr/local/bin/duplicati-influxdb-notify; \
+chmod +x /usr/local/bin/duplicati-mysql-backup; \
+chmod +x /usr/local/bin/dockerlog
+
+EXPOSE 8200

docker/README.md

@@ -32,12 +32,3 @@ volumes:
   db-dumps:
 ```
 
-## Development
-
-### Docker Build
-
-```bash
-
-#Executed on repository root folder
-docker build -t duplicati-mysqlclient:latest -f docker/mysqlclient/Dockerfile .
-```

docker/mysqlclient/Dockerfile

@@ -1,15 +0,0 @@
-
-FROM duplicati/duplicati
-RUN apt update && apt install -y default-mysql-client && rm -rf /var/lib/apt/lists/*
-
-COPY ../../ /app
-RUN ls ./app
-
-COPY ../../docker/scripts /usr/local/bin
-COPY ./scripts /usr/local/bin
-
-RUN chmod +x /usr/local/bin/duplicati-influxdb-notify
-RUN chmod +x /usr/local/bin/duplicati-mysql-backup
-RUN chmod +x /usr/local/bin/dockerlog
-
-EXPOSE 8200