particle-os/debian-image-builder-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devel: cert dir env

Browse source 
Change the cert dir env variable to include the full
cert path to make it easier to change the cert directory
if needed.
This commit is contained in:
Gianluca Zuccarelli 2021-11-11 19:05:40 +00:00 • committed by Tom Gundersen
parent 304e012168
commit 2b45ad8984
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devel/.env
View file

@ -1,5 +1,5 @@
COMPOSE_PROJECT_NAME=image-builder
STATE_DIR=./state
CERT_DIR=./state/x509
COMPOSER_CONFIG_DIR=./config/composer
WORKER_CONFIG_DIR=./config/worker
SPANDX_CONFIG=./config/spandx/local-frontend-and-api.js

24
devel/docker-compose.yml
View file

@ -7,9 +7,9 @@ services:
dockerfile: ./distribution/Dockerfile-ubi
volumes:
- ${COMPOSER_CONFIG_DIR}/osbuild-composer.toml:/etc/osbuild-composer/osbuild-composer.toml:z
- ${STATE_DIR}/x509/ca-crt.pem:/etc/osbuild-composer/ca-crt.pem:z
- ${STATE_DIR}/x509/composer-crt.pem:/etc/osbuild-composer/composer-crt.pem:z
- ${STATE_DIR}/x509/composer-key.pem:/etc/osbuild-composer/composer-key.pem:z
- ${CERT_DIR}/ca-crt.pem:/etc/osbuild-composer/ca-crt.pem:z
- ${CERT_DIR}/composer-crt.pem:/etc/osbuild-composer/composer-crt.pem:z
- ${CERT_DIR}/composer-key.pem:/etc/osbuild-composer/composer-key.pem:z
ports:
- 8080:8700
networks:
@ -23,9 +23,9 @@ services:
# override the entrypoint to specify composer hostname and port
entrypoint: [ "/usr/libexec/osbuild-composer/osbuild-worker", "composer:8700" ]
volumes:
- ${STATE_DIR}/x509/ca-crt.pem:/etc/osbuild-composer/ca-crt.pem:z
- ${STATE_DIR}/x509/worker-crt.pem:/etc/osbuild-composer/worker-crt.pem:z
- ${STATE_DIR}/x509/worker-key.pem:/etc/osbuild-composer/worker-key.pem:z
- ${CERT_DIR}/ca-crt.pem:/etc/osbuild-composer/ca-crt.pem:z
- ${CERT_DIR}/worker-crt.pem:/etc/osbuild-composer/worker-crt.pem:z
- ${CERT_DIR}/worker-key.pem:/etc/osbuild-composer/worker-key.pem:z
environment:
- CACHE_DIRECTORY=/var/cache/osbuild-composer
cap_add:
@ -65,9 +65,9 @@ services:
retries: 10
volumes:
- ./config/backend/quotas.json:/config/quotas.json:z
- ${STATE_DIR}/x509/ca-crt.pem:/etc/image-builder/ca-crt.pem:z
- ${STATE_DIR}/x509/client-crt.pem:/etc/image-builder/client-crt.pem:z
- ${STATE_DIR}/x509/client-key.pem:/etc/image-builder/client-key.pem:z
- ${CERT_DIR}/ca-crt.pem:/etc/image-builder/ca-crt.pem:z
- ${CERT_DIR}/client-crt.pem:/etc/image-builder/client-crt.pem:z
- ${CERT_DIR}/client-key.pem:/etc/image-builder/client-key.pem:z
environment:
- LISTEN_ADDRESS=backend:8086
- LOG_LEVEL=DEBUG
@ -127,9 +127,9 @@ services:
- "9000:9090"
volumes:
- ./config/prometheus:/config
- ${STATE_DIR}/x509/ca-crt.pem:/etc/image-builder/ca-crt.pem:z
- ${STATE_DIR}/x509/client-crt.pem:/etc/image-builder/client-crt.pem:z
- ${STATE_DIR}/x509/client-key.pem:/etc/image-builder/client-key.pem:z
- ${CERT_DIR}/ca-crt.pem:/etc/image-builder/ca-crt.pem:z
- ${CERT_DIR}/client-crt.pem:/etc/image-builder/client-crt.pem:z
- ${CERT_DIR}/client-key.pem:/etc/image-builder/client-key.pem:z
restart: unless-stopped
networks:
net: