Skip to content

Commit 20ee535

Browse files
committed
external
1 parent f57b43b commit 20ee535

40 files changed

+132
-296
lines changed

dockerfiles/bibliothek.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/bibliothek.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,14 +13,7 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: mongo:6
1818
tmpfs:
19-
- '/data/db'
20-
21-
22-
23-
24-
25-
19+
- '/data/db'

dockerfiles/blogapi.yaml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/blogapi.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -13,35 +14,20 @@ services:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
1516
depends_on:
16-
1717
db:
1818
condition: service_healthy
19-
20-
21-
2219
db:
2320
image: mysql:8.0
2421
tmpfs:
2522
- '/var/lib/mysql'
26-
27-
2823
environment:
2924
MYSQL_ROOT_PASSWORD: root
3025
MYSQL_DATABASE: blogapi
31-
32-
33-
3426
volumes:
3527
- ../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql
3628
- ../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql
37-
38-
39-
4029
healthcheck:
4130
test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
4231
interval: 30s
4332
timeout: 30s
44-
retries: 3
45-
46-
47-
33+
retries: 3

dockerfiles/catwatch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/catwatch.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

dockerfiles/cwa-verification.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/cwa-verification.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

dockerfiles/erc20-rest-service.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/erc20-rest-service.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

dockerfiles/familie-ba-sak.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/familie-ba-sak.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,29 +13,19 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: postgres:13.13
1818
tmpfs:
1919
- '/var/lib/postgresql/data'
20-
21-
2220
environment:
2321
POSTGRES_PASSWORD: password
2422
POSTGRES_HOST_AUTH_METHOD: trust
2523
POSTGRES_DB: familiebasak
26-
27-
28-
29-
30-
31-
3224
mock-oauth2-server:
3325
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
3426
environment:
3527
LOG_LEVEL: VERBOSE
3628
SERVER_PORT: 8083
3729
JSON_CONFIG_PATH: /app/mockoauth2.json
3830
volumes:
39-
- ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json
40-
31+
- ../scripts/dockerize/data/additional_files/familie-ba-sak/mockoauth2.json:/app/mockoauth2.json

dockerfiles/features-service.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/features-service.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

dockerfiles/genome-nexus.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/genome-nexus.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,14 +13,7 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: mongo:3.6.2
1818
tmpfs:
19-
- '/data/db'
20-
21-
22-
23-
24-
25-
19+
- '/data/db'

dockerfiles/gestaohospital.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ services:
33
build:
44
dockerfile: ./dockerfiles/gestaohospital.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
@@ -12,14 +13,7 @@ services:
1213
# volumes:
1314
# default env does not work on volumes
1415
# - ${JACOCODIR}:/jacoco
15-
1616
db:
1717
image: mongo:6
1818
tmpfs:
19-
- '/data/db'
20-
21-
22-
23-
24-
25-
19+
- '/data/db'

dockerfiles/http-patch-spring.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ services:
33
build:
44
dockerfile: ./dockerfiles/http-patch-spring.dockerfile
55
context: ..
6-
# environment:
6+
environment:
7+
AUTH_PORT: ${AUTH_PORT:-8081}
78
# TOOL: ${TOOL:-undefined}
89
# RUN: ${RUN:-0}
910
ports:
1011
- "${HOST_PORT:-8080}:8080"
1112
- "${JACOCO_PORT:-6300}:6300"
1213
# volumes:
1314
# default env does not work on volumes
14-
# - ${JACOCODIR}:/jacoco
15-
15+
# - ${JACOCODIR}:/jacoco

0 commit comments

Comments
 (0)