From c8d2d247198e8be45b4e18cc0f9ac402f15e86f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Dybiec?= Date: Wed, 17 Apr 2019 17:31:21 +0200 Subject: Inlined gitea config --- composer/gitea/docker-compose.yml | 48 ------------------------------------ docker.yml | 51 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 49 deletions(-) delete mode 100644 composer/gitea/docker-compose.yml diff --git a/composer/gitea/docker-compose.yml b/composer/gitea/docker-compose.yml deleted file mode 100644 index d7a209d..0000000 --- a/composer/gitea/docker-compose.yml +++ /dev/null @@ -1,48 +0,0 @@ -version: '2' -volumes: - data: - external: - name: gitea_data - db: - external: - name: gitea_db -networks: - gitea: - external: false -services: - web: - image: gitea/gitea - volumes: - - data:/data - ports: - - "127.0.0.1:5001:3000" - - "5022:5022" - environment: - - DB_TYPE=postgres - - DB_HOST=db:5432 - - DB_NAME=gitea - - DB_USER=gitea - - DB_PASSW=gitea - - ROOT_URL=https://git.dybiec.info - - SSH_DOMAIN=git.dybiec.info - - SSH_PORT=5022 - - APP_NAME=git.dybiec.info - - DISABLE_REGISTRATION=true - - INSTALL_LOCK=true - - RUN_MODE=prod - networks: - - gitea - depends_on: - - db - restart: always - db: - image: postgres:9.6 - restart: always - environment: - - POSTGRES_USER=gitea - - POSTGRES_PASSWORD=gitea - - POSTGRES_DB=gitea - networks: - - gitea - volumes: - - db/:/var/lib/mysql diff --git a/docker.yml b/docker.yml index 642fdc6..769356d 100644 --- a/docker.yml +++ b/docker.yml @@ -15,7 +15,56 @@ project_src: composer/nginx - name: gitea docker_service: - project_src: composer/gitea + project_name: gitea + definition: + version: '2' + volumes: + data: + external: + name: gitea_data + db: + external: + name: gitea_db + networks: + gitea: + external: false + services: + web: + image: gitea/gitea + volumes: + - data:/data + ports: + - "127.0.0.1:5001:3000" + - "5022:5022" + environment: + - DB_TYPE=postgres + - DB_HOST=db:5432 + - DB_NAME=gitea + - DB_USER=gitea + - DB_PASSW=gitea + - ROOT_URL=https://git.dybiec.info + - SSH_DOMAIN=git.dybiec.info + - SSH_PORT=5022 + - APP_NAME=git.dybiec.info + - DISABLE_REGISTRATION=true + - INSTALL_LOCK=true + - RUN_MODE=prod + networks: + - gitea + depends_on: + - db + restart: always + db: + image: postgres:9.6 + restart: always + environment: + - POSTGRES_USER=gitea + - POSTGRES_PASSWORD=gitea + - POSTGRES_DB=gitea + networks: + - gitea + volumes: + - db/:/var/lib/mysql - name: grafana docker_service: project_name: grafana -- cgit v1.2.3