Skip to content

Fix manual install to use APP_NAME and INSTALL_PATH properly #972

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
Nuru merged 1 commit into from
Feb 25, 2025
Merged

Fix manual install to use APP_NAME and INSTALL_PATH properly #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion rootfs/etc/init.d/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Otherwise present user with bootstrap script to stdout
# Otherwise (if not Atlantis) present user with bootstrap script to stdout
gomplate -f /templates/bootstrap

boot wrapper
5 changes: 3 additions & 2 deletions rootfs/templates/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash
export DOCKER_IMAGE="{{getenv "DOCKER_IMAGE" "cloudposse/geodesic"}}"
export DOCKER_TAG="{{- getenv "DOCKER_TAG" (printf "${1:-%s-%s}" ((index (getenv "GEODESIC_VERSION" | strings.Split " ") 0) | default "dev") (getenv "GEODESIC_OS" "debian")) -}}"
export APP_NAME=${APP_NAME:-${NAMESPACE:-$(basename ${DOCKER_IMAGE:-geodesic})}}
export INSTALL_PATH=${INSTALL_PATH:-/usr/local/bin}
# export APP_NAME=${APP_NAME:-${NAMESPACE:-$(basename ${DOCKER_IMAGE:-geodesic})}}
export APP_NAME="{{- getenv "APP_NAME" (getenv "NAMESPACE" (path.Base (getenv "DOCKER_IMAGE" "geodesic"))) -}}"
export INSTALL_PATH="{{- getenv "INSTALL_PATH" "/usr/local/bin" -}}"
export SAFE_INSTALL_PATH="$HOME/.local/bin" # per XDG recommendations
export INSTALLER_NAME="${APP_NAME}-installer"
export REQUIRE_PULL=${REQUIRE_PULL:-false}
Expand Down
2 changes: 1 addition & 1 deletion rootfs/usr/local/bin/boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ color "# docker run --rm ${DOCKER_IMAGE:-cloudposse/geodesic}:${version} init
color "#"
color "# After that, you should be able to launch Geodesic just by typing"
color "#"
color "# $(basename ${DOCKER_IMAGE:-geodesic})"
color "# ${APP_NAME:-$(basename ${DOCKER_IMAGE:-Geodesic})}"
color "#"
color "########################################################################################"
echo
Expand Down
Loading