forked from Hostea/dashboard
feat: re-enable gitea service in docker-compose and CI env setup
parent
9c64690c12
commit
243880f6cc
|
@ -7,9 +7,9 @@ pipeline:
|
||||||
commands:
|
commands:
|
||||||
- pip install virtualenv
|
- pip install virtualenv
|
||||||
- make env
|
- make env
|
||||||
# - make lint
|
- make lint
|
||||||
# - make coverage
|
- make coverage
|
||||||
- make integration-test
|
# - make integration-test
|
||||||
secrets: [ STRIPE_PUBLIC_KEY, STRIPE_SECRET_KEY ]
|
secrets: [ STRIPE_PUBLIC_KEY, STRIPE_SECRET_KEY ]
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -25,6 +25,7 @@ docker: ## Build Docker image from source
|
||||||
env: ## Install all dependencies
|
env: ## Install all dependencies
|
||||||
@-virtualenv venv
|
@-virtualenv venv
|
||||||
. ./venv/bin/activate && pip install -r requirements.txt
|
. ./venv/bin/activate && pip install -r requirements.txt
|
||||||
|
. ./venv/bin/activate && ./integration/ci.sh
|
||||||
|
|
||||||
freeze: ## Freeze python dependencies
|
freeze: ## Freeze python dependencies
|
||||||
@. ./venv/bin/activate && pip freeze > requirements.txt
|
@. ./venv/bin/activate && pip freeze > requirements.txt
|
||||||
|
|
|
@ -8,22 +8,22 @@ version: "3"
|
||||||
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
#gitea:
|
gitea:
|
||||||
# image: gitea/gitea:1.16.5
|
image: gitea/gitea:1.16.5
|
||||||
# container_name: hostea-dash-gitea
|
container_name: hostea-dash-gitea
|
||||||
# network_mode: host
|
network_mode: host
|
||||||
# environment:
|
environment:
|
||||||
# - USER_UID=1000
|
- USER_UID=1000
|
||||||
# - USER_GID=1000
|
- USER_GID=1000
|
||||||
# restart: always
|
restart: always
|
||||||
# #networks:
|
#networks:
|
||||||
# # - hostea-dash-gitea
|
# - hostea-dash-gitea
|
||||||
# volumes:
|
volumes:
|
||||||
# - /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
# - /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
# #ports:
|
#ports:
|
||||||
# # - "8080:3000"
|
# - "8080:3000"
|
||||||
# # - "2221:22"
|
# - "2221:22"
|
||||||
|
|
||||||
smtp:
|
smtp:
|
||||||
image: maildev/maildev:latest
|
image: maildev/maildev:latest
|
||||||
|
|
|
@ -6,15 +6,24 @@ source integration/lib.sh
|
||||||
|
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
docker_compose_down || true
|
# CI runes these dependencies as part of its config, so skipping
|
||||||
docker_compose_up
|
# spinning up deps if running from within CI,
|
||||||
setup_env
|
|
||||||
wait_for_env
|
if [ -z ${CI+x} ];
|
||||||
|
then
|
||||||
|
docker_compose_down || true
|
||||||
|
docker_compose_up
|
||||||
|
setup_env
|
||||||
|
wait_for_env
|
||||||
|
fi
|
||||||
gitea_root
|
gitea_root
|
||||||
support_repo_init
|
support_repo_init
|
||||||
fleet_repo_init
|
fleet_repo_init
|
||||||
teardown_env
|
if [ -z ${CI+x} ];
|
||||||
docker_compose_down
|
then
|
||||||
|
teardown_env
|
||||||
|
docker_compose_down
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
main
|
main
|
||||||
|
|
Loading…
Reference in New Issue