File tree Expand file tree Collapse file tree 5 files changed +22
-15
lines changed Expand file tree Collapse file tree 5 files changed +22
-15
lines changed Original file line number Diff line number Diff line change
1
+ dbname=fossology;
2
+ host=db;
3
+ user=fossy;
4
+ password=fossy;
5
+ client_encoding=utf8;
Original file line number Diff line number Diff line change 1
- fossology (3.11.0~rc2 -1) unstable; urgency=low
1
+ fossology (3.11.0~rc1 -1) unstable; urgency=low
2
2
3
3
* New upstream release
4
4
* https://github.com/fossology/fossology/releases/tag/3.11.0-rc2 for details
Original file line number Diff line number Diff line change @@ -15,5 +15,5 @@ metadata:
15
15
labels :
16
16
app : fossology
17
17
data :
18
- FOSSOLOGY_DB_HOST : db
19
- FOSSOLOGY_SCHEDULER_HOST : scheduler
18
+ FOSSOLOGY_DB_HOST : db.default.svc.cluster.local
19
+ FOSSOLOGY_SCHEDULER_HOST : scheduler.default.svc.cluster.local
Original file line number Diff line number Diff line change 1
1
apiVersion : apps/v1
2
2
kind : Deployment
3
3
metadata :
4
+ name : scheduler
4
5
labels :
5
6
app : scheduler
6
- name : scheduler
7
7
spec :
8
8
replicas : 1
9
9
selector :
@@ -13,16 +13,18 @@ spec:
13
13
type : Recreate
14
14
template :
15
15
metadata :
16
-
17
16
labels :
18
17
app : scheduler
19
18
spec :
20
19
hostname : scheduler
21
20
subdomain : svc
22
21
serviceAccountName : internal-kubectl
23
22
containers :
24
- - args :
25
- - scheduler
23
+ - name : scheduler
24
+ image : fossology/scheduler:latest
25
+ command : ["/fossology/docker-entrypoint.sh", "scheduler"]
26
+ ports :
27
+ - containerPort : 24693
26
28
env :
27
29
- name : FOSSOLOGY_DB_HOST
28
30
valueFrom :
@@ -44,18 +46,13 @@ spec:
44
46
secretKeyRef :
45
47
name : db-secret
46
48
key : POSTGRES_USER
47
- image : fossology/scheduler:latest
48
- ports :
49
- - containerPort : 24693
50
49
imagePullPolicy : IfNotPresent
51
50
livenessProbe :
52
51
exec :
53
- command :
54
- - " true"
52
+ command : ["true"]
55
53
failureThreshold : 2
56
54
periodSeconds : 5
57
55
timeoutSeconds : 5
58
- name : scheduler
59
56
resources : {}
60
57
volumeMounts :
61
58
- mountPath : /srv/fossology/repository/
Original file line number Diff line number Diff line change @@ -37,15 +37,19 @@ foreach(FO_CLIB_TARGET fossology fossology_cov)
37
37
${FO_CWD} /sqlCopy.c
38
38
${FO_CWD} /libfossagentref.h)
39
39
target_link_libraries (${FO_CLIB_TARGET}
40
- PRIVATE ${glib_LIBRARIES} ${PostgreSQL_LIBRARIES} )
40
+ PRIVATE ${glib_LIBRARIES} ${PostgreSQL_LIBRARIES} json-c curl )
41
41
endforeach ()
42
42
43
43
target_compile_options (fossology_cov PRIVATE ${FO_COV_FLAGS} )
44
44
45
45
foreach (FO_CLIB_EXEC sqlCopyTest fossconfigTest reppath)
46
46
add_executable (${FO_CLIB_EXEC} "" )
47
47
target_sources (${FO_CLIB_EXEC} PRIVATE ${FO_CLIB_EXEC} .c)
48
- target_link_libraries (${FO_CLIB_EXEC} PRIVATE fossology)
48
+ target_link_libraries (${FO_CLIB_EXEC}
49
+ PRIVATE fossology
50
+ json-c
51
+ curl
52
+ )
49
53
target_compile_definitions (${FO_CLIB_EXEC}
50
54
PRIVATE
51
55
_FILE_OFFSET_BITS=64
@@ -55,6 +59,7 @@ foreach(FO_CLIB_EXEC sqlCopyTest fossconfigTest reppath)
55
59
)
56
60
endforeach ()
57
61
62
+
58
63
target_include_directories (fossology
59
64
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR} >)
60
65
You can’t perform that action at this time.
0 commit comments