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
commit 18906112558e616839a13331081d653ca5d4eb0b Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Thu Feb 22 22:44:29 2024 -0500 Docke compose --- install/karavan-docker/config/app.ini | 98 +++++++++++++++++++++ install/karavan-docker/data.zip | Bin 0 -> 73304 bytes install/karavan-docker/docker-compose.yaml | 54 ++++++++++++ .../camel/karavan/registry/RegistryService.java | 2 +- 4 files changed, 153 insertions(+), 1 deletion(-) diff --git a/install/karavan-docker/config/app.ini b/install/karavan-docker/config/app.ini new file mode 100644 index 00000000..5d85a4c9 --- /dev/null +++ b/install/karavan-docker/config/app.ini @@ -0,0 +1,98 @@ +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/install/karavan-docker/data.zip b/install/karavan-docker/data.zip new file mode 100644 index 00000000..54e6f3f7 Binary files /dev/null and b/install/karavan-docker/data.zip differ diff --git a/install/karavan-docker/docker-compose.yaml b/install/karavan-docker/docker-compose.yaml new file mode 100644 index 00000000..db64844b --- /dev/null +++ b/install/karavan-docker/docker-compose.yaml @@ -0,0 +1,54 @@ +version: '3.8' + +services: + + karavan: + container_name: karavan + image: ghcr.io/apache/camel-karavan:4.4.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_IMAGE_REGISTRY=registry:5000 + - KARAVAN_IMAGE_REGISTRY_USERNAME= + - KARAVAN_IMAGE_REGISTRY_PASSWORD= + - KARAVAN_IMAGE_GROUP=karavan + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + labels: + - "org.apache.camel.karavan/type=internal" + 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 + 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-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java index cea3c026..ae6ff3a2 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java @@ -63,7 +63,7 @@ public class RegistryService { public String getRegistryWithGroupForSync() { String registryUrl = registry; - if (!ConfigService.inKubernetes() && installRegistry) { + if (!ConfigService.inKubernetes() && registryUrl.equalsIgnoreCase("registry:5000")) { registryUrl = "localhost:5555"; } return registryUrl + "/" + group;