Skip to content

Commit 74390ec

Browse files
author
Jorgen-5
committed
Fix inbounds and outbounds
1 parent 636311b commit 74390ec

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.nais/test/klass-api.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ spec:
2929
env:
3030
- name: SPRING_PROFILES_ACTIVE
3131
value: api, postgres, remote-solr
32+
- name: SPRING_DATA_SOLR_HOST
33+
value: http://klass-solr:8983/solr
34+
3235

3336
accessPolicy:
34-
inbound:
37+
outbound:
3538
rules:
3639
- application: klass-solr
3740

.nais/test/klass-solr.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ spec:
1818
cpu: 20m
1919
memory: 400Mi
2020

21+
accessPolicy:
22+
inbound:
23+
rules:
24+
- application: klass-solr
25+
2126
liveness:
2227
path: /solr/admin/cores?action=STATUS
2328
port: 8983

klass-shared/docker-compose.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,15 @@ services:
108108
POSTGRES_USER: "klass"
109109
POSTGRES_INSTANCE: ${POSTGRES_INSTANCE}
110110
solr:
111-
image: solr:5.5.2
111+
build:
112+
context: .
113+
dockerfile: ../klass-solr/Dockerfile
112114
container_name: solr
113115
profiles: [ search ]
114116
ports:
115117
- "8983:8983"
116118
volumes:
117119
- solr_data:/opt/solr/server/solr
118-
- ../klass-solr/src/main/resources/solr/embedded/Klass:/opt/solr/server/solr/mycores/Klass
119-
command:
120-
- solr-precreate
121-
- Klass
122-
- /opt/solr/server/solr/custom_config
123120
mem_limit: 4g
124121
volumes:
125122
pgdata:

klass-solr/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM solr:5.5.2
2+
3+
COPY src/main/resources/solr/embedded/Klass /opt/solr/server/solr/mycores/Klass
4+
5+
CMD ["solr-precreate", "Klass"]

0 commit comments

Comments
 (0)