Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions os/debian/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# bookworm-20241016 corresponds to Debian 12.7
ARG DEBIAN_CODENAME=bookworm
# Debian codenamed images are tagged with date codes rather than minor version numbers.
ARG DEBAIN_DATECODE=20241223
ARG DEBIAN_DATECODE=20241223
# Find the current version of Python at https://www.python.org/downloads/source/
ARG PYTHON_VERSION=3.12.8

Expand Down Expand Up @@ -61,7 +61,7 @@ RUN find / -xdev -name __pycache__ -exec rm -rf {} \; -prune
#
# Geodesic base image
#
FROM debian:${DEBIAN_CODENAME}-${DEBAIN_DATECODE}-slim
FROM debian:${DEBIAN_CODENAME}-${DEBIAN_DATECODE}-slim

ARG VERSION
ENV GEODESIC_VERSION=$VERSION
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/profile.d/_10-colors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function _geodesic_tput_cache_init() {
done

# Bold is not a color, handle bold without color change separately
if [[ -n "$bold"} ]]; then
if [[ -n "$bold" ]]; then
_geodesic_tput_cache["bold"]=$(printf "\x01%s\x02" "$bold")
_geodesic_tput_cache["bold-off"]=$(printf "\x01%s\x02" "$bold_off")
fi
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/profile.d/_50-workspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function file_on_host() {
for path in "${GEODESIC_HOST_PATHS[@]}"; do
# Skip paths that are just slashes, or completely empty, which would match everything
[[ "$path" =~ ^/*$ ]] && continue
if [[ "$path" == "${file}/" || "${file}" == "$path"* ]]; then
if [[ "${file}" == "${path}" || "${file}" == "$path"* ]]; then
Comment thread
RoseSecurity marked this conversation as resolved.
return 0
fi
done
Expand Down
4 changes: 2 additions & 2 deletions rootfs/etc/profile.d/helm.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
if command -v helm >/dev/null; then
# Initialize auto-completion for whichever helm version is the installed default
# Suppress error message about KUBECONFIG not found or being world readable
if [[ -r $KUBECONFIG ]]; then
chmod 600 $KUBECONFIG
if [[ -r "$KUBECONFIG" ]]; then
chmod 600 "$KUBECONFIG"
source <(helm completion bash)
else
touch /tmp/kubecfg
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/profile.d/prompt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function geodesic_prompt() {
if [[ -n ${GEODESIC_TF_PROMPT_LINE} ]]; then
tf_prompt=" ${tf_mark} ${GEODESIC_TF_PROMPT_LINE}\n"
fi
if [[ GEODESIC_TF_PROMPT_ENABLED == "true" ]]; then
if [[ $GEODESIC_TF_PROMPT_ENABLED == "true" ]]; then
KUBE_PS1_PREFIX="$(yellow-n "cluster:")("
fi
fi
Expand Down
Loading