Skip to content

Commit cf9a99c

Browse files
ziadhanyziadhany
committed
Create two purl-sync service port ( 8000,80001 ) using docker-compose
Edit env setting Signed-off-by: ziadhany <ziadhany2016@gmail.com>
1 parent 0a2ae02 commit cf9a99c

8 files changed

Lines changed: 100 additions & 13 deletions

‎purl_sync/docker.env‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
POSTGRES_DB=purl_sync
2-
POSTGRES_USER=purl_sync
3-
POSTGRES_PASSWORD=purl_sync
1+
POSTGRES_DB=purl-sync
2+
POSTGRES_USER=purl-sync
3+
POSTGRES_PASSWORD=purl-sync
44

55
PURL_SYNC_DB_HOST=db
66
PURL_SYNC_STATIC_ROOT=/var/purl_sync/static/

‎purl_sync/purl_sync/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
66
# See https://github.com/nexB/vulnerablecode for support or download.
77
# See https://aboutcode.org for more information about nexB OSS projects.
8-
#
8+
#

‎purl_sync/purl_sync/settings.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
DATABASES = {
8888
"default": {
8989
"ENGINE": env.str("PURL_SYNC_DB_ENGINE", "django.db.backends.postgresql"),
90-
"HOST": "127.0.0.1",
91-
"NAME": env.str("PURL_SYNC_DB_NAME", "purl-sync"),
92-
"USER": env.str("PURL_SYNC_DB_USER", "vulnerablecode"),
93-
"PASSWORD": env.str("PURL_SYNC_DB_PASSWORD", "vulnerablecode"),
94-
"PORT": env.str("PURL_SYNC_DB_PORT", "5432"),
90+
"HOST": env.str("POSTGRES_HOST", "127.0.0.1"),
91+
"NAME": env.str("POSTGRES_DB_NAME", "purl-sync"),
92+
"USER": env.str("POSTGRES_USER", "vulnerablecode"),
93+
"PASSWORD": env.str("POSTGRES_PASSWORD", "vulnerablecode"),
94+
"PORT": env.str("POSTGRES_PORT", "5432"),
9595
}
9696
}
9797

‎purl_sync/review/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
66
# See https://github.com/nexB/vulnerablecode for support or download.
77
# See https://aboutcode.org for more information about nexB OSS projects.
8-
#
8+
#

‎purl_sync/review/models.py‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,12 @@ class Review(models.Model):
378378
commit_id = models.CharField(max_length=300, help_text="")
379379
data = models.TextField(help_text="review data ex: vulnerability file")
380380
notes = models.ManyToManyField(Note, blank=True, help_text="")
381-
created_at = models.DateTimeField(auto_now_add=True, help_text="A field to track when review are created")
382-
updated_at = models.DateTimeField(auto_now=True, help_text="A field to track when review are updated")
381+
created_at = models.DateTimeField(
382+
auto_now_add=True, help_text="A field to track when review are created"
383+
)
384+
updated_at = models.DateTimeField(
385+
auto_now=True, help_text="A field to track when review are updated"
386+
)
383387
remote_url = models.CharField(max_length=300, blank=True, null=True, help_text="")
384388

385389
class ReviewStatus(models.IntegerChoices):
@@ -389,7 +393,11 @@ class ReviewStatus(models.IntegerChoices):
389393
MERGED = 3
390394

391395
status = models.SmallIntegerField(
392-
choices=ReviewStatus.choices, null=False, blank=False, default=0, help_text="status of review"
396+
choices=ReviewStatus.choices,
397+
null=False,
398+
blank=False,
399+
default=0,
400+
help_text="status of review",
393401
)
394402

395403
reputation = models.ManyToManyField(

‎purl_sync/review/tests/docker-compose-dev-test-federation.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
version: '3'
2+
3+
services:
4+
db1:
5+
image: postgres:16
6+
env_file:
7+
- ./docker-compose-dev-test-federation1.env
8+
volumes:
9+
- db_data1:/var/lib/postgresql/data/
10+
db2:
11+
image: postgres:16
12+
env_file:
13+
- ./docker-compose-dev-test-federation2.env
14+
volumes:
15+
- db_data2:/var/lib/postgresql/data/
16+
17+
purl_sync1:
18+
build: ../../
19+
command: /bin/sh -c "apt-get update && pip install psycopg2 --force-reinstall --no-cache-dir && python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
20+
env_file:
21+
- docker-compose-dev-test-federation1.env
22+
volumes:
23+
- /etc/purl_sync1/:/etc/purl_sync1/
24+
expose:
25+
- 8000
26+
ports:
27+
- "8000:8000"
28+
depends_on:
29+
- db1
30+
31+
purl_sync2:
32+
build: ../../
33+
command: /bin/sh -c "apt-get update && pip install psycopg2 --force-reinstall --no-cache-dir && python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
34+
env_file:
35+
- docker-compose-dev-test-federation2.env
36+
volumes:
37+
- /etc/purl_sync2/:/etc/purl_sync2/
38+
expose:
39+
- 8000
40+
ports:
41+
- "8001:8000"
42+
depends_on:
43+
- db2
44+
45+
46+
volumes:
47+
db_data1:
48+
db_data2:
49+
purl_sync1:
50+
purl_sync2:
51+

‎purl_sync/review/tests/docker-compose-dev-test-federation1.env‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
PURL_SYNC_HOST=127.0.0.1
2+
PURL_SYNC_PORT=8000
3+
PURL_SYNC_DOMAIN=${PURL_SYNC_HOST}:${PURL_SYNC_PORT}
4+
5+
POSTGRES_HOST=db1
6+
POSTGRES_DB=purl-sync
7+
POSTGRES_USER=purl-sync
8+
POSTGRES_PASSWORD=purl-sync
9+
POSTGRES_PORT=5432
10+
11+
PURL_SYNC_GIT_PATH=""
12+
PURL_SYNC_CLIENT_ID=4SDoNYvLfOG2h8LNt1ksIwZ4BSx8fZPmPar8SXKJ
13+
PURL_SYNC_CLIENT_SECRET=OrzhuzFcxeoaQ8wf1kXPyczmsh6DL10A3duTz1CuSxktvAxKlsjjiGqWUafbovZip75Kt7GmHIOouveRDER7bc41IVq29SvnTqUkFtJKCXcYArQf7WY3BiSPEOBwlw5F
14+
PURL_SYNC_STATIC_ROOT=/var/purl_sync/static/

‎purl_sync/review/tests/docker-compose-dev-test-federation2.env‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
PURL_SYNC_HOST=127.0.0.1
2+
PURL_SYNC_PORT=8000
3+
PURL_SYNC_DOMAIN=${PURL_SYNC_HOST}:${PURL_SYNC_PORT}
4+
5+
POSTGRES_HOST=db2
6+
POSTGRES_DB=purl-sync
7+
POSTGRES_USER=purl-sync
8+
POSTGRES_PASSWORD=purl-sync
9+
POSTGRES_PORT=5432
10+
11+
PURL_SYNC_GIT_PATH=""
12+
PURL_SYNC_CLIENT_ID=4SDoNYvLfOG2h8LNt1ksIwZ4BSx8fZPmPar8SXKJ
13+
PURL_SYNC_CLIENT_SECRET=OrzhuzFcxeoaQ8wf1kXPyczmsh6DL10A3duTz1CuSxktvAxKlsjjiGqWUafbovZip75Kt7GmHIOouveRDER7bc41IVq29SvnTqUkFtJKCXcYArQf7WY3BiSPEOBwlw5F
14+
PURL_SYNC_STATIC_ROOT=/var/purl_sync/static/

0 commit comments

Comments
 (0)