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 5d97f3fe5aefdfecc771d228a6b8e21f49e9d440
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Feb 23 09:28:03 2024 -0500
Docker compose
---
...ocker-compose.yaml => docker-compose-gitea.yaml} | 1 +
install/karavan-docker/docker-compose.yaml | 21 ++++-----------------
.../src/main/resources/services/internal.yaml | 15 ---------------
3 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/install/karavan-docker/docker-compose.yaml
b/install/karavan-docker/docker-compose-gitea.yaml
similarity index 95%
copy from install/karavan-docker/docker-compose.yaml
copy to install/karavan-docker/docker-compose-gitea.yaml
index db64844b..96c4d812 100644
--- a/install/karavan-docker/docker-compose.yaml
+++ b/install/karavan-docker/docker-compose-gitea.yaml
@@ -16,6 +16,7 @@ services:
- KARAVAN_IMAGE_REGISTRY_USERNAME=
- KARAVAN_IMAGE_REGISTRY_PASSWORD=
- KARAVAN_IMAGE_GROUP=karavan
+ - KARAVAN_DOCKER_NETWORK=karavan
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
labels:
diff --git a/install/karavan-docker/docker-compose.yaml
b/install/karavan-docker/docker-compose.yaml
index db64844b..ca7814df 100644
--- a/install/karavan-docker/docker-compose.yaml
+++ b/install/karavan-docker/docker-compose.yaml
@@ -8,14 +8,15 @@ services:
ports:
- "8080:8080"
environment:
- - KARAVAN_GIT_REPOSITORY=http://gitea:3000/karavan/karavan.git
- - KARAVAN_GIT_USERNAME=karavan
- - KARAVAN_GIT_PASSWORD=karavan
+ - KARAVAN_GIT_REPOSITORY=${KARAVAN_GIT_REPOSITORY}
+ - KARAVAN_GIT_USERNAME=${KARAVAN_GIT_USERNAME}
+ - KARAVAN_GIT_PASSWORD=${KARAVAN_GIT_PASSWORD}
- KARAVAN_GIT_BRANCH=main
- KARAVAN_IMAGE_REGISTRY=registry:5000
- KARAVAN_IMAGE_REGISTRY_USERNAME=
- KARAVAN_IMAGE_REGISTRY_PASSWORD=
- KARAVAN_IMAGE_GROUP=karavan
+ - KARAVAN_DOCKER_NETWORK=karavan
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
labels:
@@ -23,20 +24,6 @@ services:
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
diff --git a/karavan-web/karavan-app/src/main/resources/services/internal.yaml
b/karavan-web/karavan-app/src/main/resources/services/internal.yaml
deleted file mode 100644
index 9f01ef32..00000000
--- a/karavan-web/karavan-app/src/main/resources/services/internal.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: '3.8'
-
-services:
-
- gitea:
- image: gitea/gitea:1.20.2-rootless
- restart: always
- ports:
- - "3000:3000"
-
- registry:
- image: registry:2
- restart: always
- ports:
- - "5555:5000"
\ No newline at end of file
