From c4dfd99a8c1de24f31e49aec509f9ad1a5e558dc Mon Sep 17 00:00:00 2001 From: iamEvan Date: Sun, 14 Apr 2024 21:31:55 +0100 Subject: [PATCH 1/4] init commit --- app/Livewire/Project/Database/Import.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php index 74e41056a..11c6da314 100644 --- a/app/Livewire/Project/Database/Import.php +++ b/app/Livewire/Project/Database/Import.php @@ -27,6 +27,7 @@ class Import extends Component public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB'; public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE'; public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE'; + public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip'; public function getListeners() { @@ -62,8 +63,7 @@ class Import extends Component $this->resource->getMorphClass() == 'App\Models\StandaloneRedis' || $this->resource->getMorphClass() == 'App\Models\StandaloneKeydb' || $this->resource->getMorphClass() == 'App\Models\StandaloneDragonfly' || - $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse' || - $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb' + $this->resource->getMorphClass() == 'App\Models\StandaloneClickhouse' ) { $this->unsupported = true; } @@ -101,6 +101,10 @@ class Import extends Component $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->postgresqlRestoreCommand} {$tmpPath}'"; $this->importCommands[] = "rm {$tmpPath}"; break; + case 'App\Models\StandaloneMongodb': + $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand} {$tmpPath}'"; + $this->importCommands[] = "rm {$tmpPath}"; + break; } $this->importCommands[] = "docker exec {$this->container} sh -c 'rm {$tmpPath}'"; From 23de13b82c8aca6d2d6264e6f10337786f4b6bee Mon Sep 17 00:00:00 2001 From: iamEvan Date: Thu, 25 Apr 2024 22:44:46 +0100 Subject: [PATCH 2/4] mac dev docker-compose --- docker-compose-mac.dev.yml | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 docker-compose-mac.dev.yml diff --git a/docker-compose-mac.dev.yml b/docker-compose-mac.dev.yml new file mode 100644 index 000000000..ec1e9814f --- /dev/null +++ b/docker-compose-mac.dev.yml @@ -0,0 +1,118 @@ +version: "3.8" + +services: + coolify: + build: + context: . + dockerfile: ./docker/dev-ssu/Dockerfile + ports: + - "${APP_PORT:-8000}:80" + environment: + PUID: "${USERID:-1000}" + PGID: "${GROUPID:-1000}" + SSL_MODE: "off" + AUTORUN_LARAVEL_STORAGE_LINK: "false" + AUTORUN_LARAVEL_MIGRATION: "false" + PUSHER_HOST: "${PUSHER_HOST}" + PUSHER_PORT: "${PUSHER_PORT}" + PUSHER_SCHEME: "${PUSHER_SCHEME:-http}" + PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}" + PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}" + PUSHER_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}" + volumes: + - .:/var/www/html/:cached + postgres: + pull_policy: always + ports: + - "${FORWARD_DB_PORT:-5432}:5432" + env_file: + - .env + environment: + POSTGRES_USER: "${DB_USERNAME:-coolify}" + POSTGRES_PASSWORD: "${DB_PASSWORD:-password}" + POSTGRES_DB: "${DB_DATABASE:-coolify}" + POSTGRES_HOST_AUTH_METHOD: "trust" + volumes: + # - /data/coolify/_volumes/database/:/var/lib/postgresql/data + - coolify-pg-data-dev:/var/lib/postgresql/data + redis: + pull_policy: always + ports: + - "${FORWARD_REDIS_PORT:-6379}:6379" + env_file: + - .env + volumes: + # - /data/coolify/_volumes/redis/:/data + - coolify-redis-data-dev:/data + soketi: + env_file: + - .env + ports: + - "${FORWARD_SOKETI_PORT:-6001}:6001" + environment: + SOKETI_DEBUG: "false" + SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}" + SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}" + SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}" + vite: + image: node:20 + pull_policy: always + working_dir: /var/www/html + # environment: + # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}" + ports: + - "${VITE_PORT:-5173}:${VITE_PORT:-5173}" + volumes: + - .:/var/www/html:cached + command: sh -c "npm install && npm run dev" + networks: + - coolify + testing-host: + image: "ghcr.io/coollabsio/coolify-testing-host:latest" + pull_policy: always + init: true + container_name: coolify-testing-host + volumes: + - /:/host + - /var/run/docker.sock:/var/run/docker.sock + # - /data/coolify/:/data/coolify + - coolify-data-dev:/data/coolify + networks: + - coolify + mailpit: + image: "axllent/mailpit:latest" + pull_policy: always + container_name: coolify-mail + ports: + - "${FORWARD_MAILPIT_PORT:-1025}:1025" + - "${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025" + networks: + - coolify + minio: + image: minio/minio:latest + pull_policy: always + container_name: coolify-minio + command: server /data --console-address ":9001" + ports: + - "${FORWARD_MINIO_PORT:-9000}:9000" + - "${FORWARD_MINIO_PORT_CONSOLE:-9001}:9001" + environment: + MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}" + MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}" + volumes: + # - /data/coolify/_volumes/minio/:/data + - coolify-minio-data-dev:/data + networks: + - coolify + +volumes: + coolify-data-dev: + coolify-pg-data-dev: + coolify-redis-data-dev: + coolify-minio-data-dev: + + +networks: + coolify: + name: coolify + external: false From 3582cb3f46057278aa62ef5018b09efe91457106 Mon Sep 17 00:00:00 2001 From: iamEvan Date: Thu, 25 Apr 2024 22:44:55 +0100 Subject: [PATCH 3/4] fix mongodb imports --- app/Livewire/Project/Database/Import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php index 11c6da314..d435289fa 100644 --- a/app/Livewire/Project/Database/Import.php +++ b/app/Livewire/Project/Database/Import.php @@ -27,7 +27,7 @@ class Import extends Component public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB'; public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE'; public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE'; - public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip'; + public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip --archive='; public function getListeners() { @@ -102,7 +102,7 @@ class Import extends Component $this->importCommands[] = "rm {$tmpPath}"; break; case 'App\Models\StandaloneMongodb': - $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand} {$tmpPath}'"; + $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mongodbRestoreCommand}{$tmpPath}'"; $this->importCommands[] = "rm {$tmpPath}"; break; } From 8551e6e74af94e4b3fb58f5d62d7a9a8af0e17a8 Mon Sep 17 00:00:00 2001 From: iamEvan Date: Thu, 25 Apr 2024 22:47:47 +0100 Subject: [PATCH 4/4] opps... wrong commit --- docker-compose-mac.dev.yml | 118 ------------------------------------- 1 file changed, 118 deletions(-) delete mode 100644 docker-compose-mac.dev.yml diff --git a/docker-compose-mac.dev.yml b/docker-compose-mac.dev.yml deleted file mode 100644 index ec1e9814f..000000000 --- a/docker-compose-mac.dev.yml +++ /dev/null @@ -1,118 +0,0 @@ -version: "3.8" - -services: - coolify: - build: - context: . - dockerfile: ./docker/dev-ssu/Dockerfile - ports: - - "${APP_PORT:-8000}:80" - environment: - PUID: "${USERID:-1000}" - PGID: "${GROUPID:-1000}" - SSL_MODE: "off" - AUTORUN_LARAVEL_STORAGE_LINK: "false" - AUTORUN_LARAVEL_MIGRATION: "false" - PUSHER_HOST: "${PUSHER_HOST}" - PUSHER_PORT: "${PUSHER_PORT}" - PUSHER_SCHEME: "${PUSHER_SCHEME:-http}" - PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}" - PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}" - PUSHER_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}" - volumes: - - .:/var/www/html/:cached - postgres: - pull_policy: always - ports: - - "${FORWARD_DB_PORT:-5432}:5432" - env_file: - - .env - environment: - POSTGRES_USER: "${DB_USERNAME:-coolify}" - POSTGRES_PASSWORD: "${DB_PASSWORD:-password}" - POSTGRES_DB: "${DB_DATABASE:-coolify}" - POSTGRES_HOST_AUTH_METHOD: "trust" - volumes: - # - /data/coolify/_volumes/database/:/var/lib/postgresql/data - - coolify-pg-data-dev:/var/lib/postgresql/data - redis: - pull_policy: always - ports: - - "${FORWARD_REDIS_PORT:-6379}:6379" - env_file: - - .env - volumes: - # - /data/coolify/_volumes/redis/:/data - - coolify-redis-data-dev:/data - soketi: - env_file: - - .env - ports: - - "${FORWARD_SOKETI_PORT:-6001}:6001" - environment: - SOKETI_DEBUG: "false" - SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}" - SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}" - SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}" - vite: - image: node:20 - pull_policy: always - working_dir: /var/www/html - # environment: - # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}" - ports: - - "${VITE_PORT:-5173}:${VITE_PORT:-5173}" - volumes: - - .:/var/www/html:cached - command: sh -c "npm install && npm run dev" - networks: - - coolify - testing-host: - image: "ghcr.io/coollabsio/coolify-testing-host:latest" - pull_policy: always - init: true - container_name: coolify-testing-host - volumes: - - /:/host - - /var/run/docker.sock:/var/run/docker.sock - # - /data/coolify/:/data/coolify - - coolify-data-dev:/data/coolify - networks: - - coolify - mailpit: - image: "axllent/mailpit:latest" - pull_policy: always - container_name: coolify-mail - ports: - - "${FORWARD_MAILPIT_PORT:-1025}:1025" - - "${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025" - networks: - - coolify - minio: - image: minio/minio:latest - pull_policy: always - container_name: coolify-minio - command: server /data --console-address ":9001" - ports: - - "${FORWARD_MINIO_PORT:-9000}:9000" - - "${FORWARD_MINIO_PORT_CONSOLE:-9001}:9001" - environment: - MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}" - MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}" - volumes: - # - /data/coolify/_volumes/minio/:/data - - coolify-minio-data-dev:/data - networks: - - coolify - -volumes: - coolify-data-dev: - coolify-pg-data-dev: - coolify-redis-data-dev: - coolify-minio-data-dev: - - -networks: - coolify: - name: coolify - external: false