Skip to content

fix: pass BUILDER_CONFIGURATION to build and start #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcdurdin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: pass BUILDER_CONFIGURATION to build and start #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b7ecd
fix: pass BUILDER_CONFIGURATION to build and start
mcdurdin Sep 7, 2026
514ebe3
Merge branch 'master' into fix/16473-pass-builder_configuration
mcdurdin Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@ builder_run_action stop:app stop_docker_container $API_KEYMAN_IMAGE_NAME $API
function build_docker_container_db() {
local IMAGE_NAME=$1
local CONTAINER_NAME=$2
local BUILDER_CONFIGURATION=$3

# Download docker image. --mount option requires BuildKit
DOCKER_BUILDKIT=1 docker build -t $API_KEYMAN_DB_IMAGE_NAME -f mssql.Dockerfile .
}

builder_run_action build:db build_docker_container_db $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME
builder_run_action build:app build_docker_container $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME
builder_run_action build:db build_docker_container_db $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME $BUILDER_CONFIGURATION
builder_run_action build:app build_docker_container $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME $BUILDER_CONFIGURATION

# Custom start actions for db and app different from shared-sites
function start_docker_container_db() {
Expand All @@ -71,6 +72,7 @@ function start_docker_container_db() {
local CONTAINER_DESC=$3
# HOST not applicable
local PORT=$4
local BUILDER_CONFIGURATION=$5

local CONTAINER_ID=$(get_docker_container_id $CONTAINER_NAME)
if [ ! -z "$CONTAINER_ID" ]; then
Expand All @@ -86,7 +88,7 @@ function start_docker_container_db() {
fi

# Setup database
builder_echo "Setting up DB container"
builder_echo "Setting up DB container using $BUILDER_CONFIGURATION configuration"
docker run --rm -d -p $PORT:1433 \
-e "ACCEPT_EULA=Y" \
-e "MSSQL_AGENT_ENABLED=true" \
Expand All @@ -107,6 +109,7 @@ function start_docker_container_app() {
local CONTAINER_DESC=$3
local HOST=$4
local PORT=$5
local BUILDER_CONFIGURATION=$6

_verify_vendor_is_not_folder

Expand Down Expand Up @@ -140,7 +143,7 @@ function start_docker_container_app() {

db_ip=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${API_KEYMAN_DB_IMAGE_NAME})

builder_echo "Spooling up site container"
builder_echo "Spooling up site container using $BUILDER_CONFIGURATION configuration"

docker run --rm -m 200m -d -p $PORT:80 -v ${SITE_HTML} \
-e 'api_keyman_com_mssql_pw=yourStrong(\!)Password' \
Expand Down Expand Up @@ -170,14 +173,14 @@ function start_docker_container_app() {
builder_die "Docker container appears to have failed to start in order to run init-container.sh script"
fi

docker exec -i $CONTAINER_ID sh -c "./resources/init-container.sh"
docker exec -i $CONTAINER_ID sh -c "./resources/init-container.sh ${BUILDER_CONFIGURATION}"
fi

builder_echo green "Listening on http://$HOST:$PORT"
}

builder_run_action start:db start_docker_container_db $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME $API_KEYMAN_DB_CONTAINER_DESC $PORT_API_KEYMAN_COM_DB
builder_run_action start:app start_docker_container_app $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME $API_KEYMAN_CONTAINER_DESC $HOST_API_KEYMAN_COM $PORT_API_KEYMAN_COM
builder_run_action start:db start_docker_container_db $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME $API_KEYMAN_DB_CONTAINER_DESC $PORT_API_KEYMAN_COM_DB $BUILDER_CONFIGURATION
builder_run_action start:app start_docker_container_app $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME $API_KEYMAN_CONTAINER_DESC $HOST_API_KEYMAN_COM $PORT_API_KEYMAN_COM $BUILDER_CONFIGURATION

builder_run_action test:app test_docker_container $API_KEYMAN_CONTAINER_DESC $PORT_API_KEYMAN_COM /

Expand Down
2 changes: 2 additions & 0 deletions resources/init-container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

echo "init-container.sh $1"

openssl version
uname -a

Expand Down