Compare commits

..

49 Commits

Author SHA1 Message Date
charlesgauthereau fcac5bd0da chore(release): 1.0.3-rc.14 2026-01-28 16:05:46 +01:00
charlesgauthereau 2b8628899d fix: Dockerfile 2026-01-28 16:05:45 +01:00
charlesgauthereau 2e11ba2fd4 chore(release): 1.0.3-rc.13 2026-01-28 15:51:35 +01:00
charlesgauthereau 7d424a78f1 chore(release): 1.0.3-rc.12 2026-01-28 15:30:38 +01:00
charlesgauthereau 6089e19412 fix: Dockerfile 2026-01-28 15:30:21 +01:00
charlesgauthereau 952c70de61 chore(release): 1.0.3-rc.11 2026-01-28 15:19:47 +01:00
charlesgauthereau 99c42206c1 chore(release): 1.0.3-rc.10 2026-01-28 14:53:04 +01:00
charlesgauthereau 09b1869833 fix: assets 2026-01-28 14:53:01 +01:00
charlesgauthereau ddffae0d23 chore(release): 1.0.3-rc.9 2026-01-28 14:51:22 +01:00
charlesgauthereau de7b82c0b1 chore(release): 1.0.3-rc.8 2026-01-28 13:37:01 +01:00
charlesgauthereau 9d21cac232 fix: Dockerfile 2026-01-28 13:36:47 +01:00
charlesgauthereau 47dbb2bf40 chore(release): 1.0.3-rc.7 2026-01-28 12:56:21 +01:00
charlesgauthereau 1d4866b7ec fix: docker.yml 2026-01-28 12:56:14 +01:00
charlesgauthereau 5af49d8957 chore(release): 1.0.3-rc.6 2026-01-28 12:33:48 +01:00
charlesgauthereau 27d27be666 fix: docker.yml 2026-01-28 12:33:43 +01:00
charlesgauthereau 0f450edf35 chore(release): 1.0.3-rc.5 2026-01-28 12:31:17 +01:00
charlesgauthereau e2a6645578 fix: docker.yml 2026-01-28 12:31:14 +01:00
charlesgauthereau 12b588b74b chore(release): 1.0.3-rc.4 2026-01-28 12:29:04 +01:00
charlesgauthereau a0e7c28465 fix: docker.yml 2026-01-28 12:29:02 +01:00
charlesgauthereau d7740e05df chore(release): 1.0.3-rc.3 2026-01-28 12:25:34 +01:00
charlesgauthereau 2688ed7760 fix: docker.yml 2026-01-28 12:25:33 +01:00
charlesgauthereau a2067c063d chore(release): 1.0.3-rc.2 2026-01-28 11:55:57 +01:00
charlesgauthereau d4b597ed27 chore(release): 1.0.3-rc.2 2026-01-28 11:55:11 +01:00
charlesgauthereau 927d8d3610 fix: docker.yml 2026-01-28 11:55:03 +01:00
charlesgauthereau 7576b9bdfb chore(release): 1.0.3-rc.1 2026-01-28 10:55:41 +01:00
charlesgauthereau 1635a74c9f fix: mongo docker configuration. 2026-01-28 10:53:15 +01:00
Charles GTE e41a7a7c5b Merge pull request #4 from Portabase/fix/mongo-folder
fix: mongo domain folder name
2026-01-24 19:15:27 +01:00
charlesgauthereau 2b7c7a3bd1 fix: mongo domain folder name 2026-01-24 19:14:54 +01:00
charlesgauthereau e7f072c9c8 fix: .gitignore 2026-01-22 10:50:42 +01:00
charlesgauthereau d9c5cb7a09 fix: .gitignore 2026-01-22 10:49:03 +01:00
charlesgauthereau b45b227c91 fix: .gitignore 2026-01-22 10:48:39 +01:00
charlesgauthereau 8032639da6 chore(release): 1.0.2 2026-01-22 10:47:46 +01:00
Charles GTE c418164b48 Merge pull request #3 from Portabase/feat/arm-architecture
feat/arm-architecture
2026-01-22 10:46:40 +01:00
Charles GTE b4095ca51a chore: README.md 2026-01-22 10:42:20 +01:00
charlesgauthereau 48b1cb07f5 chore(release): 1.0.2-rc.1 2026-01-21 21:48:07 +01:00
charlesgauthereau a21e9b385c feat: Docker image for ARM architecture 2026-01-21 21:47:06 +01:00
Charles GTE 8f89830ccc chore: Update README.md 2026-01-20 23:03:19 +01:00
Charles GTE 3480e332f2 chore: README.md 2026-01-20 23:00:21 +01:00
Charles GTE 0389e24af2 Merge pull request #2 from Portabase/dev
fix: version_str when ping server.
2026-01-20 22:46:36 +01:00
charlesgauthereau c68d4ee5f4 fix: version_str when ping server. 2026-01-20 22:45:55 +01:00
charlesgauthereau a1eaa2a671 chore(release): 1.0.1 2026-01-20 22:44:46 +01:00
Charles GTE 79ed82dd15 Merge pull request #1 from Portabase/feat/add-mongodb
feat/add-mongodb
2026-01-20 22:43:16 +01:00
charlesgauthereau da07f03878 feat: Adding MongoDB support 2026-01-20 22:42:22 +01:00
charlesgauthereau e867e857ee feat: MongoDB provider 2026-01-18 21:19:55 +01:00
charlesgauthereau f36b816941 chore(release): 1.0.1-rc.1 2026-01-12 11:53:09 +01:00
charlesgauthereau a11b81bfdd fix: patch timezone error. 2026-01-12 11:52:57 +01:00
charlesgauthereau 1229dc2769 fix: Cargo.lock 2026-01-09 19:18:04 +01:00
charlesgauthereau 0d771c7ea4 chore(release): 1.0.0 2026-01-09 19:17:22 +01:00
charlesgauthereau ee3924d070 fix: refactoring mysql side and tested the method. Add logging with config from env 2026-01-09 19:16:50 +01:00
35 changed files with 1354 additions and 225 deletions
+9
View File
@@ -37,6 +37,12 @@ jobs:
with:
fetch-depth: 0
- name: Set up QEMU (enables multi-arch emulation)
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
with:
@@ -58,6 +64,9 @@ jobs:
with:
context: .
file: ${{ inputs.dockerfile }}
# TODO : fix long build in arm64
# platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: true
tags: ${{ steps.set-tags.outputs.tags }}
target: ${{ inputs.target }}
+1 -1
View File
@@ -3,4 +3,4 @@
/src/data/
.DS_Store
.env
+2 -2
View File
@@ -22,5 +22,5 @@ keywords:
- self-hosted
- portabase
license: Apache-2.0
version: 1.0.0-rc.1
date-released: "2026-01-09"
version: 1.0.3-rc.14
date-released: "2026-01-28"
Generated
+842 -115
View File
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "portabase-agent"
version = "1.0.0-rc.1"
version = "1.0.3-rc.14"
edition = "2024"
[dependencies]
@@ -31,6 +31,7 @@ futures = "0.3.31"
tracing-log = "0.2.0"
tracing-appender = "0.2.4"
time = { version = "0.3.44", features = ["macros"] }
mongodb = "3.5.0"
[[bin]]
name = "app"
+29
View File
@@ -0,0 +1,29 @@
include .env
export $(shell sed 's/=.*//' .env)
.PHONY: seed-mongo seed-mysql seed-postgres
seed-mongo:
@echo "Seeding MongoDB..."
bash ./scripts/mongo/seed-mongo.sh
seed-mongo-auth:
@echo "Seeding MongoDB with auth..."
bash ./scripts/mongo/seed-mongo.sh auth
seed-mysql:
@echo "Seeding MySQL..."
mysql -h 127.0.0.1 -P "$$MYSQL_PORT" -u "$$MYSQL_USER" -p"$$MYSQL_PASSWORD" "$$MYSQL_DB" < ./scripts/mysql/seed-mysql.sql
seed-postgres:
@echo "Seeding Postgres..."
docker exec -i -e PGPASSWORD=$$PG_PASSWORD $$PG_CONTAINER \
psql -U $$PG_USER -d $$PG_DB < ./scripts/postgres/seed.sql
seed-postgres-1gb:
@echo "Seeding Postgres..."
docker exec -i -e PGPASSWORD=$$PG_PASSWORD $$PG_CONTAINER \
psql -U $$PG_USER -d $$PG_DB < ./scripts/postgres/seed-1gb.sql
seed-all: seed-mongo seed-mysql seed-postgres seed-postgres-1gb
+6 -4
View File
@@ -12,13 +12,15 @@
</p>
[![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
[![Docker Pulls](https://img.shields.io/docker/pulls/solucetechnologies/agent-portabase-rust?color=brightgreen)](https://hub.docker.com/r/solucetechnologies/agent-portabase)
[![Docker Pulls](https://img.shields.io/docker/pulls/portabase/agent?color=brightgreen)](https://hub.docker.com/r/portabase/agent)
[![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/Portabase/portabase)
[![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
[![PostgreSQL](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3120/)
[![PostgreSQL](https://img.shields.io/badge/PostgreSQL-336791?logo=postgresql&logoColor=white)](https://www.postgresql.org/)
[![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
[![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
[![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
[![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
[![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
@@ -53,9 +55,9 @@ You have 4 ways to install Portabase Agent:
## Contributors
<a href="https://github.com/Portabase/agent-portabase/graphs/contributors">
<img src="https://contrib.rocks/image?repo=Portabase/agent-portabase" alt="contrib.rocks image" />
</a>
[![Contributors](https://contrib.rocks/image?repo=Portabase/agent-rust)](https://github.com/Portabase/agent-rust/graphs/contributors)
[!["Support Portabase"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/portabase)
## License
+24 -14
View File
@@ -1,34 +1,44 @@
{
"databases": [
{
"name": "Test database 1 - rust",
"name": "Test database 1 - PostgreSQL",
"database": "devdb",
"type": "postgresql",
"username": "devuser",
"password": "changeme",
"port": 5432,
"host": "db",
"host": "db-postgres",
"generated_id": "16678159-ff7e-4c97-8c83-0adeff214681"
},
{
"name": "Test database 2 - rust",
"database": "devdb",
"type": "postgresql",
"username": "devuser",
"password": "changeme",
"port": 5432,
"host": "db",
"generated_id": "16678156-ff7e-4c97-8c83-0adeff214681"
},
{
"name": "Test database 3 - rust",
"name": "Test database 2 - MariaDB",
"database": "mariadb",
"type": "mysql",
"username": "mariadb",
"password": "changeme",
"port": 3306,
"host": "db2",
"host": "db-mariadb",
"generated_id": "16678124-ff7e-4c97-8c83-0adeff214681"
},
{
"name": "Test database 4 - MongoDB Auth",
"database": "testdbauth",
"type": "mongodb",
"username": "root",
"password": "rootpassword",
"port": 27017,
"host": "db-mongodb-auth",
"generated_id": "16678145-ff7e-4c97-8c83-0adeff214681"
},
{
"name": "Test database 5 - MongoDB",
"database": "testdb",
"type": "mongodb",
"username": "",
"password": "",
"port": 27017,
"host": "db-mongodb",
"generated_id": "16678147-ff7e-4c97-8c83-0adeff214681"
}
]
}
+24 -14
View File
@@ -1,29 +1,39 @@
[[databases]]
name = "Test database 1 - rust"
name = "Test database 1 - PostgreSQL"
database = "devdb"
type = "postgresql"
username = "devuser"
password = "changeme"
port = 5432
host = "db"
host = "db-postgres"
generated_id = "16678159-ff7e-4c97-8c83-0adeff214689"
[[databases]]
name = "Test database 2 - rust"
database = "devdb"
type = "postgresql"
username = "devuser"
password = "changeme"
port = 5432
host = "db"
generated_id = "16678156-ff7e-4c97-8c83-0adeff214654"
[[databases]]
name = "Test database 3 - rust"
name = "Test database 2 - MariaDB"
database = "mariadb"
type = "mysql"
username = "mariadb"
password = "changeme"
port = 3306
host = "db1"
host = "db-mariadb"
generated_id = "16678124-ff7e-4c97-8c83-0adeff214667"
[[databases]]
name = "Test database 3 - MongoDB Auth"
database = "testdbauth"
type = "mongodb"
username = "root"
password = "rootpassword"
port = 27017
host = "db-mongodb-auth"
generated_id = "16678145-ff7e-4c97-8c83-0adeff214681"
[[databases]]
name = "Test database 3 - MongoDB"
database = "testdb"
type = "mongodb"
username = ""
password = ""
port = 27017
host = "db-mongodb"
generated_id = "16678147-ff7e-4c97-8c83-0adeff214681"
+5 -34
View File
@@ -4,50 +4,21 @@ services:
context: .
dockerfile: docker/Dockerfile
target: prod
# image: portabase/agent:latest
container_name: rust-prod
volumes:
- ./databases.toml:/config/config.toml
- ./databases.json:/config/config.json
environment:
# APP_ENV: production
# APP_ENV: production
LOG: info
TZ: "Europe/Paris"
DATABASES_CONFIG_FILE: "config.toml"
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOThlZmY1YjEtMDQyZC00MDkxLWJkYjctZTgzYmM0YjczNjAxIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUFuYUVKdnVBSExlNGF5d0RmNGplelVobm45VXRkdksyZ3pEMEg2cERJYXczYkJKRkpwVnVDXG5uVFV3MXA3Q2RnOXBzdjZhRnpyOXZPd0J2MjMzckxpdVpCT2lCb2p2Q0QrSlZid3hyTzBRRW5hN2dmaHV1ZGYwXG5VVlJOMkxmK1g1aTkvZzJTNm5xcExoTm1DaGFJNk8ybktYZUNlRmtubEErRUJrNnFoV1FCVGozb05TYTFTOFY1XG40UFRTT2I4NUo3a2k5YllEbXRiNWxrU3dCNXdXOTdtQjg0ZzI2WHAvU3FFcmhKc0NGK3YrN09vTWYzTzJqTTNoXG5XMUQ0MzBPRitWaklwUGdoV09rZy96NXZQUWFHRzhqQ0h4VDlJR0Q0bjhyS05LQ3FTOGNyN2diTGU0cWpNdmhvXG5BQVVvaHpHR2FRNkhlWlJ4S0UvM3J1a2JldnY5dnJ2TTNRSURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
# DATABASES_CONFIG_FILE: "config.toml"
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiY2VlZmNmNDQtOGE0YS00NjZlLTkwNDEtN2QzNDMzZjRjOTJkIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUFuYUVKdnVBSExlNGF5d0RmNGplelVobm45VXRkdksyZ3pEMEg2cERJYXczYkJKRkpwVnVDXG5uVFV3MXA3Q2RnOXBzdjZhRnpyOXZPd0J2MjMzckxpdVpCT2lCb2p2Q0QrSlZid3hyTzBRRW5hN2dmaHV1ZGYwXG5VVlJOMkxmK1g1aTkvZzJTNm5xcExoTm1DaGFJNk8ybktYZUNlRmtubEErRUJrNnFoV1FCVGozb05TYTFTOFY1XG40UFRTT2I4NUo3a2k5YllEbXRiNWxrU3dCNXdXOTdtQjg0ZzI2WHAvU3FFcmhKc0NGK3YrN09vTWYzTzJqTTNoXG5XMUQ0MzBPRitWaklwUGdoV09rZy96NXZQUWFHRzhqQ0h4VDlJR0Q0bjhyS05LQ3FTOGNyN2diTGU0cWpNdmhvXG5BQVVvaHpHR2FRNkhlWlJ4S0UvM3J1a2JldnY5dnJ2TTNRSURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
extra_hosts:
- "localhost:host-gateway"
networks:
- portabase
db:
image: postgres:17-alpine
ports:
- "5413:5432"
volumes:
- postgres-data:/var/lib/postgresql/data
environment:
- POSTGRES_DB=devdb
- POSTGRES_USER=devuser
- POSTGRES_PASSWORD=changeme
networks:
- portabase
db2:
image: mariadb:latest
ports:
- "3313:3306"
environment:
- MYSQL_DATABASE=mariadb
- MYSQL_USER=mariadb
- MYSQL_PASSWORD=changeme
- MYSQL_RANDOM_ROOT_PASSWORD=yes
volumes:
- mariadb-data:/var/lib/mysql
networks:
- portabase
volumes:
postgres-data:
mariadb-data:
networks:
+72 -25
View File
@@ -4,6 +4,7 @@ services:
context: .
dockerfile: docker/Dockerfile
target: dev
# platform: linux/arm64
container_name: rust-dev
volumes:
- .:/app
@@ -11,54 +12,100 @@ services:
# - ./databases.toml:/config/config.toml
- cargo-registry:/usr/local/cargo/registry
- cargo-git:/usr/local/cargo/git
- cargo-target:/app/target
environment:
APP_ENV: development
LOG: debug
# POOLING: 1
TZ: "Europe/Paris"
# DATABASES_CONFIG_FILE: "config.toml"
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOThlZmY1YjEtMDQyZC00MDkxLWJkYjctZTgzYmM0YjczNjAxIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUFuYUVKdnVBSExlNGF5d0RmNGplelVobm45VXRkdksyZ3pEMEg2cERJYXczYkJKRkpwVnVDXG5uVFV3MXA3Q2RnOXBzdjZhRnpyOXZPd0J2MjMzckxpdVpCT2lCb2p2Q0QrSlZid3hyTzBRRW5hN2dmaHV1ZGYwXG5VVlJOMkxmK1g1aTkvZzJTNm5xcExoTm1DaGFJNk8ybktYZUNlRmtubEErRUJrNnFoV1FCVGozb05TYTFTOFY1XG40UFRTT2I4NUo3a2k5YllEbXRiNWxrU3dCNXdXOTdtQjg0ZzI2WHAvU3FFcmhKc0NGK3YrN09vTWYzTzJqTTNoXG5XMUQ0MzBPRitWaklwUGdoV09rZy96NXZQUWFHRzhqQ0h4VDlJR0Q0bjhyS05LQ3FTOGNyN2diTGU0cWpNdmhvXG5BQVVvaHpHR2FRNkhlWlJ4S0UvM3J1a2JldnY5dnJ2TTNRSURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiNjc4M2QwY2UtNjY1MS00YzM0LTg4YjYtNDhmMmU5YWQ3NGNhIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUFybjR5bk9OUUwzMGZITERBTjRuNGN4OTNkOHZSTVBzaVYyY2xSU1lDWkNHYnlqakhURW5mXG52dzQ5V1ltS0w3STJJK1dLa00wOEMvQ0NISVlMOE13WSsyNjNnN1dmcjJsQzdIOTFQOTFTK1ZtcCtuREZxVGM5XG45VEZiNXpwb09yaXNZQ3o4M2VLeTV1Q3ZCWXpMODhicmhXNVBlU0VPN3R4SFZBaEp3aWVMWU1JTjJvdTBzWFFiXG5DQ200T3FjRGJBeCs1WmNZVjBPM2NTMjlvNWxaYlV4ZHdxcHl6bjFCSnRETXErYS9tVjFDekxBeGNMd0llNW1WXG5LalBjM01EQ3NvcGJ5czhqcFQ2eFcvSGd5b0c0MkhnL0g3RDdKK21BYlRKZ2JyVGVLdkdaQ1dzMDZGR0hrK1RFXG5RdExwOUprR1lhenVDVFF4TlIvTUU0ejFlNGFrOGsxNmlRSURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
#POOLING: 1
#DATABASES_CONFIG_FILE: "config.toml"
extra_hosts:
- "localhost:host-gateway"
networks:
- portabase
db:
image: postgres:17-alpine
# db-postgres:
# container_name: db-postgres
# image: postgres:17-alpine
# ports:
# - "5436:5432"
# volumes:
# - postgres-data:/var/lib/postgresql/data
# environment:
# - POSTGRES_DB=devdb
# - POSTGRES_USER=devuser
# - POSTGRES_PASSWORD=changeme
# networks:
# - portabase
#
# db-mariadb:
# container_name: db-mariadb
# image: mariadb:latest
# ports:
# - "3311:3306"
# environment:
# - MYSQL_DATABASE=mariadb
# - MYSQL_USER=mariadb
# - MYSQL_PASSWORD=changeme
# - MYSQL_RANDOM_ROOT_PASSWORD=yes
# volumes:
# - mariadb-data:/var/lib/mysql
# networks:
# - portabase
db-mongodb-auth:
container_name: db-mongodb-auth
image: mongo:latest
ports:
- "5436:5432"
volumes:
- postgres-data:/var/lib/postgresql/data
- "27082:27017"
environment:
- POSTGRES_DB=devdb
- POSTGRES_USER=devuser
- POSTGRES_PASSWORD=changeme
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: rootpassword
MONGO_INITDB_DATABASE: testdbauth
command: mongod --auth
networks:
- portabase
db2:
image: mariadb:latest
ports:
- "3311:3306"
environment:
- MYSQL_DATABASE=mariadb
- MYSQL_USER=mariadb
- MYSQL_PASSWORD=changeme
- MYSQL_RANDOM_ROOT_PASSWORD=yes
volumes:
- mariadb-data:/var/lib/mysql
- mongodb-data-auth:/data/db
healthcheck:
test: [ "CMD", "mongo", "--eval", "db.adminCommand('ping')" ]
interval: 5s
timeout: 5s
retries: 10
db-mongodb:
container_name: db-mongodb
image: mongo:latest
ports:
- "27083:27017"
volumes:
- mongodb-data:/data/db
healthcheck:
test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')" ]
interval: 5s
timeout: 5s
retries: 10
environment:
MONGO_INITDB_DATABASE: testdb
networks:
- portabase
volumes:
cargo-registry:
cargo-git:
cargo-target:
postgres-data:
mariadb-data:
# postgres-data:
# mariadb-data:
mongodb-data:
mongodb-data-auth:
networks:
portabase:
name: portabase_network
external: true
external: true
# docker network create portabase_network
+24 -1
View File
@@ -19,10 +19,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
&& rm -rf /var/lib/apt/lists/*
ARG TARGETARCH
# =========================
# PostgreSQL client binaries (versions 12-18)
# =========================
ARG TARGETARCH
RUN for v in 12 13 14 15 16 17 18; do \
mkdir -p /usr/lib/postgresql/$v/bin; \
@@ -44,6 +45,17 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
chmod +x /usr/lib/postgresql/*/bin/*
# =========================
# MongoDB Database Tools
# =========================
RUN if [ "$TARGETARCH" = "amd64" ]; then \
wget -q https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian12-x86_64-100.10.0.deb -O /tmp/mongodb-tools.deb; \
elif [ "$TARGETARCH" = "arm64" ]; then \
wget -q https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-arm64-100.10.0.deb -O /tmp/mongodb-tools.deb; \
fi && \
apt-get update && apt-get install -y /tmp/mongodb-tools.deb && \
rm -f /tmp/mongodb-tools.deb && rm -rf /var/lib/apt/lists/*
WORKDIR /app
# =========================
@@ -88,8 +100,19 @@ RUN apt-get update && apt-get install -y \
libncurses6 \
zlib1g \
mariadb-client \
wget \
gnupg \
libssl3 \
&& rm -rf /var/lib/apt/lists/*
# MongoDB Database Tools
RUN if [ "$TARGETARCH" = "amd64" ]; then \
wget -q https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian12-x86_64-100.10.0.deb -O /tmp/mongodb-tools.deb; \
elif [ "$TARGETARCH" = "arm64" ]; then \
wget -q https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-arm64-100.10.0.deb -O /tmp/mongodb-tools.deb; \
fi && \
apt-get update && apt-get install -y /tmp/mongodb-tools.deb --fix-missing && \
rm -f /tmp/mongodb-tools.deb && rm -rf /var/lib/apt/lists/*
WORKDIR /app
+12
View File
@@ -0,0 +1,12 @@
# Seed instructions
## MongoDB
```bash
make seed-mongo
make seed-mongo-auth
make seed-mysql
make seed-postgres
make seed-postgres-1gb
make seed-all
```
+71
View File
@@ -0,0 +1,71 @@
#!/usr/bin/env bash
# Usage:
# ./seed-mongo.sh -> no auth
# ./seed-mongo.sh auth -> with auth
MODE=${1:-noauth} # default: noauth
# Default values (can be overridden via .env)
MONGO_DB=${MONGO_DB:-testdb}
MONGO_PORT=${MONGO_PORT:-27017}
# Auth variables
MONGO_AUTH_USERNAME=${MONGO_AUTH_USERNAME:-root}
MONGO_AUTH_PASSWORD=${MONGO_AUTH_PASSWORD:-rootpassword}
MONGO_AUTH_DB=${MONGO_AUTH_DB:-testdbauth}
NUM_USERS=${NUM_USERS:-5000}
# Build connection string
if [ "$MODE" = "auth" ]; then
MONGO_CONTAINER=${MONGO_AUTH_CONTAINER:-db-mongodb-auth}
URI="mongodb://$MONGO_AUTH_USERNAME:$MONGO_AUTH_PASSWORD@localhost:$MONGO_PORT/$MONGO_AUTH_DB?authSource=admin"
echo "Using authenticated MongoDB..."
else
MONGO_CONTAINER=${MONGO_CONTAINER:-db-mongodb}
URI="mongodb://localhost:$MONGO_PORT/$MONGO_DB"
echo "Using non-authenticated MongoDB..."
fi
# Create temp JS seed file
SEED_FILE=$(mktemp /tmp/seed.XXXX.js)
cat <<EOF > "$SEED_FILE"
db = connect("$URI");
// Drop collections if exist
if (db.users) db.users.drop();
if (db.products) db.products.drop();
// Generate users
const users = [];
for (let i = 1; i <= $NUM_USERS; i++) {
users.push({
username: "user" + i,
email: "user" + i + "@example.com",
age: Math.floor(Math.random() * 60) + 18,
active: Math.random() > 0.5,
createdAt: new Date()
});
}
db.users.insertMany(users);
// Generate products
const products = [];
for (let i = 1; i <= Math.floor($NUM_USERS/10); i++) {
products.push({
name: "Product " + i,
price: parseFloat((Math.random()*100).toFixed(2)),
stock: Math.floor(Math.random()*500),
createdAt: new Date()
});
}
db.products.insertMany(products);
print("Seed complete: " + users.length + " users, " + products.length + " products.");
EOF
docker cp "$SEED_FILE" "$MONGO_CONTAINER:/seed.js"
docker exec -it "$MONGO_CONTAINER" mongosh /seed.js
rm "$SEED_FILE"
+3 -3
View File
@@ -1,5 +1,4 @@
#![allow(dead_code)]
use crate::domain::mongodb::database::MongoDatabase;
use crate::domain::mysql::database::MySQLDatabase;
use crate::domain::postgres::database::PostgresDatabase;
use crate::domain::postgres::{detect_format_from_file, detect_format_from_size};
@@ -11,7 +10,6 @@ use std::sync::Arc;
#[async_trait::async_trait]
pub trait Database: Send + Sync {
fn file_extension(&self) -> &'static str;
async fn ping(&self) -> Result<bool>;
async fn backup(&self, backup_dir: &Path) -> Result<PathBuf>;
async fn restore(&self, restore_file: &Path) -> Result<()>;
@@ -28,6 +26,7 @@ impl DatabaseFactory {
}
DbType::Mysql => Arc::new(MySQLDatabase::new(cfg)),
DbType::Mariadb => Arc::new(MySQLDatabase::new(cfg)),
DbType::MongoDB => Arc::new(MongoDatabase::new(cfg)),
}
}
@@ -39,6 +38,7 @@ impl DatabaseFactory {
}
DbType::Mysql => Arc::new(MySQLDatabase::new(cfg)),
DbType::Mariadb => Arc::new(MySQLDatabase::new(cfg)),
DbType::MongoDB => Arc::new(MongoDatabase::new(cfg)),
}
}
}
+1
View File
@@ -1,4 +1,5 @@
pub mod factory;
pub mod postgres;
pub mod mysql;
mod mongodb;
+35
View File
@@ -0,0 +1,35 @@
use crate::domain::mongodb::connection::{get_mongo_uri};
use crate::services::config::DatabaseConfig;
use anyhow::{Context, Result};
use std::path::PathBuf;
use std::process::Command;
use tracing::{debug, error, info};
pub async fn run(
cfg: DatabaseConfig,
backup_dir: PathBuf,
file_extension: &'static str,
) -> Result<PathBuf> {
tokio::task::spawn_blocking(move || -> Result<PathBuf> {
debug!("Starting MongoDB backup for database {}", cfg.name);
let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
let uri = get_mongo_uri(cfg.clone());
let output = Command::new("mongodump")
.arg(format!("--uri={}", uri))
.arg(format!("--archive={}", file_path.display()))
.arg("--gzip")
.output()
.context("MongoDB backup failed")?;
if !output.status.success() {
let stderr = String::from_utf8_lossy(&output.stderr);
error!("MongoDB backup failed for {}: {}", cfg.name, stderr);
anyhow::bail!("MongoDB backup failed for {}: {}", cfg.name, stderr);
}
info!("MongoDB backup completed for {}", cfg.name);
Ok(file_path)
})
.await?
}
+24
View File
@@ -0,0 +1,24 @@
use crate::services::config::DatabaseConfig;
use anyhow::Result;
use mongodb::Client;
pub async fn connect(cfg: DatabaseConfig) -> Result<Client> {
let uri = get_mongo_uri(cfg);
let mut options = mongodb::options::ClientOptions::parse(&uri).await?;
options.server_selection_timeout = Some(std::time::Duration::from_secs(3));
options.connect_timeout = Some(std::time::Duration::from_secs(3));
let client = Client::with_options(options)?;
Ok(client)
}
pub fn get_mongo_uri(cfg: DatabaseConfig) -> String {
if cfg.username.is_empty() {
format!("mongodb://{}:{}/{}", cfg.host, cfg.port, cfg.database)
} else {
format!(
"mongodb://{}:{}@{}:{}/{}?authSource=admin",
cfg.username, cfg.password, cfg.host, cfg.port, cfg.database
)
}
}
+48
View File
@@ -0,0 +1,48 @@
use anyhow::Result;
use async_trait::async_trait;
use std::path::{Path, PathBuf};
use super::{backup, ping, restore};
use crate::domain::factory::Database;
use crate::services::config::DatabaseConfig;
use crate::utils::locks::{DbOpLock, FileLock};
pub struct MongoDatabase {
cfg: DatabaseConfig,
}
impl MongoDatabase {
pub fn new(cfg: DatabaseConfig) -> Self {
Self { cfg }
}
}
#[async_trait]
impl Database for MongoDatabase {
fn file_extension(&self) -> &'static str {
".archive.gz"
}
async fn ping(&self) -> Result<bool> {
ping::run(self.cfg.clone()).await
}
async fn backup(&self, dir: &Path) -> Result<PathBuf> {
FileLock::acquire(&self.cfg.generated_id, DbOpLock::Backup.as_str()).await?;
let res = backup::run(
self.cfg.clone(),
dir.to_path_buf(),
self.file_extension(),
)
.await;
FileLock::release(&self.cfg.generated_id).await?;
res
}
async fn restore(&self, file: &Path) -> Result<()> {
FileLock::acquire(&self.cfg.generated_id, DbOpLock::Restore.as_str()).await?;
let res = restore::run(self.cfg.clone(), file.to_path_buf()).await;
FileLock::release(&self.cfg.generated_id).await?;
res
}
}
+5
View File
@@ -0,0 +1,5 @@
mod backup;
mod restore;
pub mod database;
mod ping;
mod connection;
+24
View File
@@ -0,0 +1,24 @@
#![allow(dead_code)]
use crate::services::config::DatabaseConfig;
use anyhow::Result;
use mongodb::bson::doc;
use tracing::{error};
use crate::domain::mongodb::connection::connect;
pub async fn run(cfg: DatabaseConfig) -> Result<bool> {
let client = connect(cfg.clone()).await?;
let db_name = if cfg.username.is_empty() { &cfg.database } else { "admin" };
match client.database(db_name).run_command(doc! {"ping": 1}).await {
Ok(_) => Ok(true),
Err(e) => {
error!("--- MongoDB Connection Error Details ---");
error!("Target Host: {}:{}", cfg.host, cfg.port);
error!("Error Kind: {:?}", e.kind);
error!("Full Error: {}", e);
error!("Check you database network connectivity");
error!("----------------------------------------");
Err(anyhow::anyhow!("Ping failed for {}: {}", cfg.name, e))
}
}
}
+32
View File
@@ -0,0 +1,32 @@
use crate::domain::mongodb::connection::{get_mongo_uri};
use crate::services::config::DatabaseConfig;
use anyhow::{Context, Result};
use std::path::PathBuf;
use std::process::Command;
use tracing::{debug, error, info};
pub async fn run(cfg: DatabaseConfig, restore_file: PathBuf) -> Result<()> {
tokio::task::spawn_blocking(move || -> Result<()> {
debug!("Starting MongoDB restore for database {}", cfg.name);
let uri = get_mongo_uri(cfg.clone());
let output = Command::new("mongorestore")
.arg(format!("--uri={}", uri))
.arg(format!("--archive={}", restore_file.display()))
.arg("--gzip")
.arg("--drop")
.output()
.with_context(|| format!("Failed to run mongorestore for {}", cfg.name))?;
if !output.status.success() {
let stderr = String::from_utf8_lossy(&output.stderr);
error!("MongoDB restore failed for {}: {}", cfg.name, stderr);
anyhow::bail!("MongoDB restore failed for : {}", cfg.name);
}
info!("MongoDB restore completed for {}", cfg.name);
Ok(())
})
.await?
}
+16 -3
View File
@@ -1,10 +1,10 @@
use crate::domain::mysql::connection::server_version;
use crate::services::config::DatabaseConfig;
use anyhow::{Context, Result};
use tracing::debug;
use std::collections::HashMap;
use std::path::PathBuf;
use std::process::Command;
use crate::services::config::DatabaseConfig;
use tracing::{debug, error, info};
pub async fn run(
cfg: DatabaseConfig,
@@ -15,6 +15,19 @@ pub async fn run(
tokio::task::spawn_blocking(move || -> Result<PathBuf> {
debug!("Starting backup for database {}", cfg.name);
let version = match futures::executor::block_on(server_version(&cfg)) {
Ok(v) => {
debug!("Mysql version detected: {}", v);
v
}
Err(e) => {
error!("Failed to get server version for {}: {:?}", cfg.name, e);
return Err(e.into());
}
};
info!("Mysql version found: {}", version);
let file_path = backup_dir.join(format!("{}{}", cfg.generated_id, file_extension));
let output = Command::new("mysqldump")
+27
View File
@@ -0,0 +1,27 @@
use crate::services::config::DatabaseConfig;
use std::process::Command;
use anyhow::Result;
pub async fn server_version(cfg: &DatabaseConfig) -> Result<String> {
let output = Command::new("mysql")
.arg("--host").arg(&cfg.host)
.arg("--port").arg(cfg.port.to_string())
.arg("--user").arg(&cfg.username)
.arg("-e").arg("SELECT VERSION();")
.env("MYSQL_PWD", &cfg.password)
.output()?;
if !output.status.success() {
let stderr = String::from_utf8_lossy(&output.stderr);
anyhow::bail!("Version query failed: {}", stderr);
}
let version = String::from_utf8_lossy(&output.stdout)
.lines()
.nth(1) // skip column header
.unwrap_or_default()
.trim()
.to_string();
Ok(version)
}
+2 -1
View File
@@ -1,4 +1,5 @@
pub mod backup;
pub mod database;
mod restore;
mod ping;
mod ping;
mod connection;
+1 -1
View File
@@ -7,7 +7,6 @@ use crate::utils::common::BackupMethod;
use crate::utils::file::full_extension;
use anyhow::Result;
use hex;
use tracing::{error, info};
use openssl::encrypt::Encrypter;
use openssl::hash::MessageDigest;
use openssl::pkey::PKey;
@@ -19,6 +18,7 @@ use std::path::{Path, PathBuf};
use std::sync::Arc;
use tempfile::TempDir;
use tokio::fs;
use tracing::{error, info};
#[derive(Debug)]
pub struct BackupResult {
+2
View File
@@ -16,6 +16,7 @@ pub enum DbType {
Mysql,
Mariadb,
Postgresql,
MongoDB
// Sqlite,
// Add other DB types if needed
}
@@ -26,6 +27,7 @@ impl DbType {
DbType::Mysql => "mysql",
DbType::Mariadb => "mysql",
DbType::Postgresql => "postgresql",
DbType::MongoDB => "mongodb",
// DbType::Sqlite => "sqlite",
}
}
+1
View File
@@ -101,6 +101,7 @@ impl RestoreService {
let db_instance = DatabaseFactory::create_for_restore(cfg.clone(), &backup_file_path).await;
let reachable = db_instance.ping().await.unwrap_or(false);
info!("Reachable: {}", reachable);
if !reachable {
return Ok(RestoreResult {
generated_id,
+1 -1
View File
@@ -91,7 +91,7 @@ impl StatusService {
})
.collect();
let version_str = format!("{}-rust", CONFIG.app_version);
let version_str = CONFIG.app_version.as_str();
let body = StatusRequestBody {
version: &version_str,
+3 -2
View File
@@ -1,5 +1,5 @@
use anyhow::{Context, Result};
use chrono::Utc;
use chrono::{Local};
use tracing::{info, warn, error};
use std::path::{Path, PathBuf};
use std::time::{Duration, SystemTime};
@@ -90,7 +90,8 @@ impl FileLock {
f.write_all(format!("Service: {}\n", service_name).as_bytes()).await?;
f.write_all(format!("PID: {}\n", std::process::id()).as_bytes()).await?;
f.write_all(format!("Timestamp: {}\n", Utc::now()).as_bytes()).await?;
// f.write_all(format!("Timestamp: {}\n", Utc::now()).as_bytes()).await?;
f.write_all(format!("Timestamp: {}\n", Local::now()).as_bytes()).await?;
info!("Successfully acquired lock for {}", id);
Ok(())
+3 -2
View File
@@ -1,7 +1,7 @@
use crate::utils::task_manager::models;
use crate::utils::task_manager::tasks::{remove_task, upsert_task};
use crate::utils::text::normalize_cron;
use chrono::Utc;
use chrono::{Local};
use cron::Schedule;
use tracing::debug;
use redis::AsyncCommands;
@@ -11,7 +11,8 @@ use tracing::info;
pub fn next_run_timestamp(expr: &str) -> i64 {
let schedule = Schedule::from_str(expr).unwrap();
schedule.upcoming(Utc).next().unwrap().timestamp()
// schedule.upcoming(Utc).next().unwrap().timestamp()
schedule.upcoming(Local).next().unwrap().timestamp()
}
pub async fn check_and_update_cron(
+3 -1
View File
@@ -13,7 +13,9 @@ use tracing::error;
pub async fn scheduler_loop(mut conn: MultiplexedConnection) {
loop {
let now = chrono::Utc::now().timestamp();
// let now = chrono::Utc::now().timestamp();
let now = chrono::Local::now().timestamp();
// info!("Scheduling task {}", chrono::Local::now());
let due: Vec<String> = conn
.zrangebyscore(SCHEDULE_KEY, 0, now)