feat(docker-compose): Allow directory name different from service or component names

This commit is contained in:
2022-06-06 04:37:03 +02:00
parent 2540cb5ba8
commit 0ea8efffcd
7 changed files with 104 additions and 26 deletions

View File

@@ -4,10 +4,10 @@
# ARG EXAMPLE_ARG_FOR_DOCKERFILE
# Another env var, this one's needed in the example build step below:
# ARG HASHICORPVAULT_VERSION
# ARG VAULT_VERSION
# Example
# FROM "hashicorpvault:${HASHICORPVAULT_VERSION}"
# FROM "vault:${VAULT_VERSION}"
# RUN apt-get update && \
# apt-get -y install \
# somepackage-6.q16-6-extra && \

View File

@@ -1,10 +1,10 @@
services:
hashicorpvault-build:
image: "hashicorpvault:${HASHICORPVAULT_VERSION}"
vault-build:
image: "vault:${VAULT_VERSION}"
profiles: ["build"]
build:
context: "build-context/hashicorpvault"
context: "build-context/vault"
dockerfile: Dockerfile
args:
EXAMPLE_ARG_FOR_DOCKERFILE: "${EXAMPLE_ARG_FROM_ENV_FILE}"
HASHICORPVAULT_VERSION: "${HASHICORPVAULT_VERSION}"
VAULT_VERSION: "${VAULT_VERSION}"

View File

@@ -1,24 +1,24 @@
services:
hashicorpvault:
image: "hashicorpvault:${HASHICORPVAULT_VERSION}"
container_name: "hashicorpvault-${CONTEXT}"
vault:
image: "vault:${VAULT_VERSION}"
container_name: "vault-${CONTEXT}"
networks:
hashicorpvault-default:
vault-default:
extends:
file: common-settings.yml
service: common-settings
ports:
# - "8080:80"
volumes:
# - /opt/docker-data/hashicorpvault-${CONTEXT}/data/db:/usr/lib/hashicorpvault
# - /opt/docker-data/hashicorpvault-${CONTEXT}/data/logs:/var/log/hashicorpvault
# - /opt/docker-data/hashicorpvault-${CONTEXT}/config:/etc/hashicorpvault
# - /opt/docker-data/vault-${CONTEXT}/data/db:/usr/lib/vault
# - /opt/docker-data/vault-${CONTEXT}/data/logs:/var/log/vault
# - /opt/docker-data/vault-${CONTEXT}/config:/etc/vault
environment:
# HASHICORPVAULT_USER: ${HASHICORPVAULT_USER}
# HASHICORPVAULT_PASSWORD: ${HASHICORPVAULT_PASSWORD}
# VAULT_USER: ${VAULT_USER}
# VAULT_PASSWORD: ${VAULT_PASSWORD}
networks:
hashicorpvault-default:
name: hashicorpvault-${CONTEXT}
vault-default:
name: vault-${CONTEXT}
driver: bridge
driver_opts:
com.docker.network.enable_ipv6: "false"

View File

@@ -4,7 +4,7 @@ CONTEXT=fsf
# Set something sensible here and uncomment
# ---
# HASHICORPVAULT_VERSION=x.y.z
# VAULT_VERSION=x.y.z