Skip to content

Commit 95b208c

Browse files
committed
chore: add development tags to dev build
use same image for prod and dev
1 parent 7329028 commit 95b208c

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

api/src/main/resources/application.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# TODO: Figure out how to use environment variables when running detached API
21
# Configure JDBC MySQL instance source
32
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:sbox}?autoReconnect=true
43
spring.datasource.username=${MYSQL_USER}

compose.dev.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
# Author: Ian Dunn
55
# Author: Derek Garcia
66

7-
name: sbom-in-a-box
7+
name: sbom-in-a-box_development
88
services:
99
# OSI container
1010
osi:
11-
container_name: osi
11+
container_name: osi_dev
12+
image: osi
1213
build: osi
14+
pull_policy: never # use local build
1315
ports:
1416
- "5000:5000"
1517
healthcheck:
@@ -21,7 +23,7 @@ services:
2123

2224
# MySQL server
2325
sbox_db:
24-
container_name: sbox_db
26+
container_name: sbox_db_dev
2527
image: mysql:8.4.6
2628
command: --max_allowed_packet=32505856 # Set max_allowed_packet to 256M
2729
env_file:
@@ -45,8 +47,10 @@ services:
4547

4648
# SBOM-in-a-box API spring-boot application
4749
sbox_api:
48-
container_name: sbox_api
50+
container_name: sbox_api_dev
51+
image: sbox_api
4952
build: .
53+
pull_policy: never # use local build
5054
ports:
5155
- "8080:8080"
5256
env_file:

compose.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ services:
99
# OSI container
1010
osi:
1111
container_name: osi
12+
image: osi
1213
build: osi
14+
pull_policy: never # use local build
1315
healthcheck:
1416
test: ["CMD", "curl", "-f", "http://localhost:5000/healthcheck"]
1517
start_period: 15s # small delay to let startup scripts finish
@@ -42,7 +44,9 @@ services:
4244
# SBOM-in-a-box API spring-boot application
4345
sbox_api:
4446
container_name: sbox_api
47+
image: sbox_api
4548
build: .
49+
pull_policy: never # use local build
4650
ports:
4751
- "8080:8080"
4852
env_file:

0 commit comments

Comments
 (0)