Fixed build and env

This commit is contained in:
Christian Anetzberger committed 2026-10-31 14:13:55 +01:00
1 parent 967299888a
commit b26b8f22a4
4 files changed
+488 -30

No files matched your search

Regular → Executable
+86 -30
View File
@@ -2,21 +2,38 @@
#!/usr/bin/env bash
set -euo pipefail
# --------------------------------------------------
# Configuration
# --------------------------------------------------
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
REPO_DIR="${ROOT_DIR}/frappe_repo"
FRAPPE_REPO="${FRAPPE_DOCKER_DIR:-${ROOT_DIR}/../frappe_docker}"
REGISTRY_IMAGE="git.prothmann.com/christian/erpnexthp"
BUILD_IMAGE="${REGISTRY_IMAGE}:build-local"
cd "$REPO_DIR"
if [[ ! -f "${FRAPPE_REPO}/images/layered/Containerfile" ]]; then
echo "ERROR: frappe_docker repository not found."
exit 1
fi
if [[ ! -f "${ROOT_DIR}/docker-compose.override.yml" ]]; then
echo "ERROR: Missing docker-compose.override.yml"
exit 1
fi
cd "$FRAPPE_REPO"
APPS_FILE="$(mktemp)"
COMPOSE_ENV_FILE="$(mktemp)"
trap 'rm -f "$APPS_FILE" "$COMPOSE_ENV_FILE"' EXIT
# --------------------------------------------------
# 1. Define applications
# --------------------------------------------------
APPS_FILE="$(mktemp)"
trap 'rm -f "$APPS_FILE"' EXIT
cat > "$APPS_FILE" <<'JSON'
[
{
@@ -57,7 +74,7 @@ docker buildx build \
.
# --------------------------------------------------
# 3. Read ERPNext version from built image
# 3. Detect actual ERPNext version
# --------------------------------------------------
ERP_VERSION="$(
@@ -69,7 +86,7 @@ ERP_VERSION="$(
| awk -F '"' '/^__version__ = / {print $2; exit}'
)"
if [[ ! "$ERP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
if [[ ! "$ERP_VERSION" =~ ^16\.[0-9]+\.[0-9]+$ ]]; then
echo "ERROR: Could not determine ERPNext version."
exit 1
fi
@@ -78,40 +95,79 @@ FINAL_IMAGE="${REGISTRY_IMAGE}:${ERP_VERSION}"
echo "Detected ERPNext version: ${ERP_VERSION}"
docker tag "${BUILD_IMAGE}" "${FINAL_IMAGE}"
# --------------------------------------------------
# 4. Tag and push to Gitea
# 4. Prepare temporary Compose environment
# --------------------------------------------------
docker tag "${BUILD_IMAGE}" "${FINAL_IMAGE}"
# Dummy database password is used only during
# generation. The production override reads the
# real password from hyp1's .env file.
{
printf 'ERPNEXT_VERSION=%s\n' "$ERP_VERSION"
printf 'CUSTOM_IMAGE=%s\n' "$REGISTRY_IMAGE"
printf 'CUSTOM_TAG=%s\n' "$ERP_VERSION"
cat <<'ENV'
DB_PASSWORD=COMPOSE_TEMPLATE_ONLY
PULL_POLICY=always
RESTART_POLICY=unless-stopped
SITES_RULE=Host(`erp16.prothmann.com`)
ENV
} > "$COMPOSE_ENV_FILE"
# --------------------------------------------------
# 5. Generate official production Compose
# --------------------------------------------------
echo "Generating production Docker Compose..."
docker compose \
--env-file "$COMPOSE_ENV_FILE" \
--project-name erpnext-16 \
-f compose.yaml \
-f overrides/compose.mariadb.yaml \
-f overrides/compose.redis.yaml \
config > "${ROOT_DIR}/docker-compose.yml"
# --------------------------------------------------
# 6. Validate final configuration
# --------------------------------------------------
echo "Validating Docker Compose..."
docker compose \
--env-file "$COMPOSE_ENV_FILE" \
--project-name erpnext-16 \
-f "${ROOT_DIR}/docker-compose.yml" \
-f "${ROOT_DIR}/docker-compose.override.yml" \
config --quiet
echo "Docker Compose validation successful."
# --------------------------------------------------
# 7. Push image to Gitea
# --------------------------------------------------
echo "Publishing ${FINAL_IMAGE}..."
docker push "${FINAL_IMAGE}"
# --------------------------------------------------
# 5. Generate official Compose for hyp1
# 8. Summary
# --------------------------------------------------
echo "Generating production Docker Compose..."
docker compose \
--project-name erpnext-16 \
-f compose.yaml \
-f overrides/compose.mariadb.yaml \
-f overrides/compose.redis.yaml \
config --no-interpolate \
> "${ROOT_DIR}/docker-compose.yml"
# Ensure the version stays configurable
if ! grep -q 'CUSTOM_IMAGE' "${ROOT_DIR}/docker-compose.yml"; then
echo "ERROR: Image variables were not preserved."
exit 1
fi
echo ""
echo "Build completed successfully."
echo "Image: ${FINAL_IMAGE}"
echo "Compose: ${ROOT_DIR}/docker-compose.yml"
echo "============================================"
echo " ERPNext production build completed"
echo "============================================"
echo ""
echo "ERPNext version: ${ERP_VERSION}"
echo "Docker image: ${FINAL_IMAGE}"
echo "Compose file: ${ROOT_DIR}/docker-compose.yml"
echo ""
echo "Update ERPNEXT_VERSION=${ERP_VERSION} on hyp1."
echo ""