This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 6da8a5de Do not push templates and configuration
6da8a5de is described below
commit 6da8a5decab4086850697cdb10e644a6cd371e11
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Jul 22 10:13:48 2024 -0400
Do not push templates and configuration
---
docs/WEB_DOCKER.md | 17 ----
docs/install/karavan-docker/config/app.ini | 98 ---------------------
docs/install/karavan-docker/data.zip | Bin 73304 -> 0 bytes
.../karavan-docker/docker-compose-gitea.yaml | 70 ---------------
.../apache/camel/karavan/KaravanStartupLoader.java | 2 -
5 files changed, 187 deletions(-)
diff --git a/docs/WEB_DOCKER.md b/docs/WEB_DOCKER.md
index b0f56aaa..7e880dbd 100644
--- a/docs/WEB_DOCKER.md
+++ b/docs/WEB_DOCKER.md
@@ -16,20 +16,3 @@
docker compose up
```
3. Open http://localhost:8080
-
-### How to run Demo Karavan on Docker with Gitea
-
-1. Download [karavan-docker](install/karavan-docker) folder
-2. Unzip data.zip with Gitea database in karavan-docker folder
- ```
- unzip data.zip
- ```
-2. Create network
- ```
- docker network create karavan
- ```
-3. Start Karavan
- ```
- docker compose -f docker-compose-gitea.yaml up
- ```
-3. Open http://localhost:8080
diff --git a/docs/install/karavan-docker/config/app.ini
b/docs/install/karavan-docker/config/app.ini
deleted file mode 100644
index 5d85a4c9..00000000
--- a/docs/install/karavan-docker/config/app.ini
+++ /dev/null
@@ -1,98 +0,0 @@
-APP_NAME = Gitea: Git with a cup of tea
-RUN_USER = git
-RUN_MODE = prod
-WORK_PATH = /var/lib/gitea
-
-[repository]
-ROOT = /var/lib/gitea/git/repositories
-
-[repository.local]
-LOCAL_COPY_PATH = /tmp/gitea/local-repo
-
-[repository.upload]
-TEMP_PATH = /tmp/gitea/uploads
-
-[server]
-APP_DATA_PATH = /var/lib/gitea
-SSH_DOMAIN = gitea
-HTTP_PORT = 3000
-ROOT_URL = http://localhost:3000/
-DISABLE_SSH = false
-; In rootless gitea container only internal ssh server is supported
-START_SSH_SERVER = true
-SSH_PORT = 2222
-SSH_LISTEN_PORT = 2222
-BUILTIN_SSH_SERVER_USER = git
-LFS_START_SERVER = true
-DOMAIN = localhost
-LFS_JWT_SECRET = cc4pXAedXHJSZ9GvVQoGDP8mL6mkok3qP-XoGKBpg-g
-OFFLINE_MODE = false
-
-[database]
-PATH = /var/lib/gitea/data/gitea.db
-DB_TYPE = sqlite3
-HOST = localhost:3306
-NAME = gitea
-USER = root
-PASSWD =
-SCHEMA =
-SSL_MODE = disable
-LOG_SQL = false
-
-[session]
-PROVIDER_CONFIG = /var/lib/gitea/data/sessions
-PROVIDER = file
-
-[picture]
-AVATAR_UPLOAD_PATH = /var/lib/gitea/data/avatars
-REPOSITORY_AVATAR_UPLOAD_PATH = /var/lib/gitea/data/repo-avatars
-
-[attachment]
-PATH = /var/lib/gitea/data/attachments
-
-[log]
-ROOT_PATH = /var/lib/gitea/data/log
-MODE = console
-LEVEL = info
-
-[security]
-INSTALL_LOCK = true
-SECRET_KEY =
-REVERSE_PROXY_LIMIT = 1
-REVERSE_PROXY_TRUSTED_PROXIES = *
-INTERNAL_TOKEN =
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE3MDg2NTM3NjB9.c5cId2fvNYfSqFAl4V23C9m4w6Xw89dxkoZp8YBpDh0
-PASSWORD_HASH_ALGO = pbkdf2
-
-[service]
-DISABLE_REGISTRATION = false
-REQUIRE_SIGNIN_VIEW = false
-REGISTER_EMAIL_CONFIRM = false
-ENABLE_NOTIFY_MAIL = false
-ALLOW_ONLY_EXTERNAL_REGISTRATION = false
-ENABLE_CAPTCHA = false
-DEFAULT_KEEP_EMAIL_PRIVATE = false
-DEFAULT_ALLOW_CREATE_ORGANIZATION = true
-DEFAULT_ENABLE_TIMETRACKING = true
-NO_REPLY_ADDRESS = noreply.localhost
-
-[lfs]
-PATH = /var/lib/gitea/git/lfs
-
-[mailer]
-ENABLED = false
-
-[openid]
-ENABLE_OPENID_SIGNIN = true
-ENABLE_OPENID_SIGNUP = true
-
-[cron.update_checker]
-ENABLED = false
-
-[repository.pull-request]
-DEFAULT_MERGE_STYLE = merge
-
-[repository.signing]
-DEFAULT_TRUST_MODEL = committer
-
-[oauth2]
-JWT_SECRET = NydT-c0maoxZfgOHloby9v2liDWM2lSs995O-rI6G2c
diff --git a/docs/install/karavan-docker/data.zip
b/docs/install/karavan-docker/data.zip
deleted file mode 100644
index 54e6f3f7..00000000
Binary files a/docs/install/karavan-docker/data.zip and /dev/null differ
diff --git a/docs/install/karavan-docker/docker-compose-gitea.yaml
b/docs/install/karavan-docker/docker-compose-gitea.yaml
deleted file mode 100644
index d5fc1ff3..00000000
--- a/docs/install/karavan-docker/docker-compose-gitea.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: karavan
-
-services:
-
- karavan:
- container_name: karavan
- image: ghcr.io/apache/camel-karavan:4.7.0
- ports:
- - "8080:8080"
- environment:
- - KARAVAN_GIT_REPOSITORY=http://gitea:3000/karavan/karavan.git
- - KARAVAN_GIT_USERNAME=karavan
- - KARAVAN_GIT_PASSWORD=karavan
- - KARAVAN_GIT_BRANCH=main
- - KARAVAN_CONTAINER_IMAGE_REGISTRY=registry:5000
- - KARAVAN_CONTAINER_IMAGE_REGISTRY_USERNAME=
- - KARAVAN_CONTAINER_IMAGE_REGISTRY_PASSWORD=
- - KARAVAN_CONTAINER_IMAGE_GROUP=karavan
- - KARAVAN_DOCKER_NETWORK=karavan
- volumes:
- - "/var/run/docker.sock:/var/run/docker.sock"
- labels:
- - "org.apache.camel.karavan/type=internal"
- depends_on:
- gitea:
- condition: service_healthy
- restart: true
- restart_policy:
- condition: on-failure
- delay: 3s
- max_attempts: 5
- window: 60s
- networks:
- - karavan
-
- gitea:
- container_name: gitea
- image: gitea/gitea:1.21.6-rootless
- restart: always
- ports:
- - "3000:3000"
- volumes:
- - ./data:/var/lib/gitea
- - ./config:/etc/gitea
- healthcheck:
- test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz";]
- interval: 1m
- timeout: 10s
- retries: 3
- start_period: 10s
- labels:
- - "org.apache.camel.karavan/type=internal"
- networks:
- - karavan
-
- registry:
- container_name: registry
- image: registry:2
- restart: always
- ports:
- - "5555:5000"
- labels:
- - "org.apache.camel.karavan/type=internal"
- networks:
- - karavan
-
-networks:
- karavan:
- name: karavan
- external: true
\ No newline at end of file
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
index f6df27ea..747a118f 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
@@ -168,7 +168,6 @@ public class KaravanStartupLoader implements HealthCheck {
ProjectFile file = new ProjectFile(name, value,
Project.Type.templates.name(), Instant.now().toEpochMilli());
karavanCache.saveProjectFile(file, false);
});
-
projectService.commitAndPushProject(Project.Type.templates.name(), "Add
templates");
} else {
codeService.getTemplates().forEach((name, value) -> {
ProjectFile f =
karavanCache.getProjectFile(Project.Type.templates.name(), name);
@@ -196,7 +195,6 @@ public class KaravanStartupLoader implements HealthCheck {
ProjectFile file = new ProjectFile(name, value,
Project.Type.configuration.name(), Instant.now().toEpochMilli());
karavanCache.saveProjectFile(file, false);
});
-
projectService.commitAndPushProject(Project.Type.configuration.name(), "Add
configuration");
} else {
codeService.getConfigurationFiles().forEach((name, value) -> {
ProjectFile f =
karavanCache.getProjectFile(Project.Type.configuration.name(), name);
