Skip to content

fix(build): correct env vars passing to Docker and Dart via --dart-define #3037

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

Merged
CharlVS merged 4 commits into from
Aug 6, 2025
Merged

fix(build): correct env vars passing to Docker and Dart via --dart-define #3037

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7b9b5b
refactor: simplify Docker env vars and build command logic
DeckerSU Aug 5, 2025
b3ab2e0
fix executable rights on build.sh
DeckerSU Aug 1, 2025
2d0ac42
remove the redundant FEEDBACK_TEST_URL, as it will no longer be used …
DeckerSU Aug 1, 2025
40991f7
swap BUILD_COMMAND and BUILD_CMD (important)
DeckerSU Aug 4, 2025
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
64 changes: 45 additions & 19 deletions .docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,53 @@ mkdir -p ./build

COMMIT_HASH=$(git rev-parse --short HEAD | cut -c1-7)

# Only pass GITHUB_API_PUBLIC_READONLY_TOKEN as environment variable
ENV_ARGS=""
ENV_VARS="GITHUB_API_PUBLIC_READONLY_TOKEN TRELLO_API_KEY \
TRELLO_TOKEN TRELLO_BOARD_ID TRELLO_LIST_ID \
FEEDBACK_API_KEY FEEDBACK_PRODUCTION_URL \
COMMIT_HASH"
if [ -n "$GITHUB_API_PUBLIC_READONLY_TOKEN" ]; then
ENV_ARGS="-e GITHUB_API_PUBLIC_READONLY_TOKEN=$GITHUB_API_PUBLIC_READONLY_TOKEN"
fi

# Build command logic
BUILD_COMMAND="flutter build $BUILD_TARGET --no-pub --$BUILD_MODE"
# Prepare build command with feedback service credentials
BUILD_CMD="$BUILD_COMMAND"
# Add commit hash to build command
BUILD_CMD="$BUILD_CMD --dart-define=COMMIT_HASH=$COMMIT_HASH"

# Check and add the shared Trello board and list IDs if they are available
HAVE_TRELLO_IDS=false
if [ -n "$TRELLO_BOARD_ID" ] && [ -n "$TRELLO_LIST_ID" ]; then
HAVE_TRELLO_IDS=true
# Add these shared IDs to the build command
BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_BOARD_ID=$TRELLO_BOARD_ID"
BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_LIST_ID=$TRELLO_LIST_ID"
fi

for VAR in $ENV_VARS; do
case "$VAR" in
GITHUB_API_PUBLIC_READONLY_TOKEN) VALUE=$GITHUB_API_PUBLIC_READONLY_TOKEN ;;
TRELLO_API_KEY) VALUE=$TRELLO_API_KEY ;;
TRELLO_TOKEN) VALUE=$TRELLO_TOKEN ;;
TRELLO_BOARD_ID) VALUE=$TRELLO_BOARD_ID ;;
TRELLO_LIST_ID) VALUE=$TRELLO_LIST_ID ;;
FEEDBACK_API_KEY) VALUE=$FEEDBACK_API_KEY ;;
FEEDBACK_PRODUCTION_URL) VALUE=$FEEDBACK_PRODUCTION_URL ;;
COMMIT_HASH) VALUE=$COMMIT_HASH ;;
*) VALUE= ;;
esac
# Add Trello feedback service variables if ALL required values are provided
if [ "$HAVE_TRELLO_IDS" = true ] && [ -n "$TRELLO_API_KEY" ] && [ -n "$TRELLO_TOKEN" ]; then
echo "Adding Trello feedback service configuration"
BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_API_KEY=$TRELLO_API_KEY"
BUILD_CMD="$BUILD_CMD --dart-define=TRELLO_TOKEN=$TRELLO_TOKEN"
else
# If any Trello credential is missing, log a message but continue the build
if [ -n "$TRELLO_API_KEY" ] || [ -n "$TRELLO_TOKEN" ] || [ -n "$TRELLO_BOARD_ID" ] || [ -n "$TRELLO_LIST_ID" ]; then
echo "Warning: Incomplete Trello credentials provided. All Trello credentials must be present to include them in the build."
fi
fi

[ -n "$VALUE" ] && ENV_ARGS="$ENV_ARGS -e $VAR=$VALUE"
done
# Add Cloudflare feedback service variables if ALL required values are provided
# Note: Cloudflare also needs the Trello board and list IDs to be available
if [ "$HAVE_TRELLO_IDS" = true ] && [ -n "$FEEDBACK_API_KEY" ] && [ -n "$FEEDBACK_PRODUCTION_URL" ]; then
echo "Adding Cloudflare feedback service configuration"
BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_API_KEY=$FEEDBACK_API_KEY"
BUILD_CMD="$BUILD_CMD --dart-define=FEEDBACK_PRODUCTION_URL=$FEEDBACK_PRODUCTION_URL"
else
# If any Cloudflare credential is missing, log a message but continue the build
if [ -n "$FEEDBACK_API_KEY" ] || [ -n "$FEEDBACK_PRODUCTION_URL" ] ||
([ -n "$TRELLO_BOARD_ID" ] || [ -n "$TRELLO_LIST_ID" ]); then
echo "Warning: Incomplete Cloudflare feedback credentials provided. All Cloudflare credentials and Trello board/list IDs must be present to include them in the build."
fi
fi

# Use the provided arguments for flutter build
# Build a second time if needed, as asset downloads will require a rebuild on the first attempt
Expand All @@ -71,4 +97,4 @@ docker run $PLATFORM_FLAG --rm -v ./build:/app/build \
-u "$HOST_UID:$HOST_GID" \
$ENV_ARGS \
komodo/komodo-wallet:latest sh -c \
"sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; flutter build web --no-pub || true; flutter build $BUILD_TARGET --config-only; flutter build $BUILD_TARGET --no-pub --dart-define=COMMIT_HASH=$COMMIT_HASH --$BUILD_MODE"
"sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; $BUILD_COMMAND || true; flutter build $BUILD_TARGET --config-only; $BUILD_CMD"