diff --git a/.gitignore b/.gitignore index 58c653d7a8fabed7665a95e30b9aa82566e23b54..64bdc30cce7efefb18d86f7837e9b301cf3ff2b1 100644 --- a/.gitignore +++ b/.gitignore @@ -123,7 +123,6 @@ celerybeat.pid .env.* !.env.example .venv -env/ venv/ ENV/ env.bak/ diff --git a/README.md b/README.md index 6ff557981679272a5995695608464d6826312f7c..68567a7d3cd590b600ab78365d75f26fef973727 100644 --- a/README.md +++ b/README.md @@ -1 +1,23 @@ # Netbox Europa Distribution + +## Requirement + +- docker +- docker-compose + +## Run localy + +### on Linux + +sudo TAG=latest docker-compose -f docker-compose.yml -f docker-compose.test.yml up -d + +### on Mac + +env TAG=latest docker-compose -f docker-compose.yml -f docker-compose.test.yml up -d + +### Login to Netbox + +url : http://localhost:8080 +login: admin +password: thisnetboxisnot4u + diff --git a/ansible/deploy_on_test.yml b/ansible/deploy_on_test.yml index fe9ca1497a84900da4e06018d45758ef7269dd22..0144b1787a9ce87601d1f45d9d6cb9e8f961b9c9 100644 --- a/ansible/deploy_on_test.yml +++ b/ansible/deploy_on_test.yml @@ -14,12 +14,12 @@ - name: Copy testing docker-compose file ansible.builtin.copy: - src: "../tests/docker-compose.test.yml" + src: "../docker-compose.test.yml" dest: "/home/debian/netbox/{{ lookup('ansible.builtin.env','CI_PIPELINE_ID') }}/docker-compose.override.yml" - name: Copy testing env variables ansible.builtin.copy: - src: "../tests/env" + src: "../env" dest: "/home/debian/netbox/{{ lookup('ansible.builtin.env','CI_PIPELINE_ID') }}/" - name: Create .env file diff --git a/tests/docker-compose.test.yml b/docker-compose.test.yml similarity index 90% rename from tests/docker-compose.test.yml rename to docker-compose.test.yml index bb018c0bb797969b83ab89b51f796b781ac917fd..bb90b1f916e8332847d148c28496fbc7de23f7f3 100644 --- a/tests/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -5,7 +5,8 @@ services: ports: - 8080:8080 healthcheck: - start_period: 240s + start_period: 2s + retries: 30 env_file: env/netbox.env netbox-worker: env_file: env/netbox.env diff --git a/tests/env/netbox.env b/env/netbox.env similarity index 100% rename from tests/env/netbox.env rename to env/netbox.env diff --git a/tests/env/postgres.env b/env/postgres.env similarity index 100% rename from tests/env/postgres.env rename to env/postgres.env diff --git a/tests/env/redis-cache.env b/env/redis-cache.env similarity index 100% rename from tests/env/redis-cache.env rename to env/redis-cache.env diff --git a/tests/env/redis.env b/env/redis.env similarity index 100% rename from tests/env/redis.env rename to env/redis.env