Compare commits
2 Commits
b548dfed3e
...
d60e44508a
| Author | SHA1 | Date | |
|---|---|---|---|
| d60e44508a | |||
| 93721b9096 |
@@ -237,6 +237,12 @@ if [ "$DID_GITHUB" -eq 1 ] || [ "$DID_GITEA" -eq 1 ]; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif command -v gh >/dev/null 2>&1 || command -v tea >/dev/null 2>&1; then
|
||||
# gh and/or tea are installed but neither is actually logged in yet (login
|
||||
# was declined, failed, or never completed) - say why the key-generation
|
||||
# question above got skipped instead of just silently not asking.
|
||||
echo "Skipping SSH/GPG key setup: not logged in to GitHub or Gitea yet."
|
||||
echo "Log in (gh auth login / tea login add) then re-run: bash /opt/coder/cli-setup-wizard.sh --force"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -237,6 +237,12 @@ if [ "$DID_GITHUB" -eq 1 ] || [ "$DID_GITEA" -eq 1 ]; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif command -v gh >/dev/null 2>&1 || command -v tea >/dev/null 2>&1; then
|
||||
# gh and/or tea are installed but neither is actually logged in yet (login
|
||||
# was declined, failed, or never completed) - say why the key-generation
|
||||
# question above got skipped instead of just silently not asking.
|
||||
echo "Skipping SSH/GPG key setup: not logged in to GitHub or Gitea yet."
|
||||
echo "Log in (gh auth login / tea login add) then re-run: bash /opt/coder/cli-setup-wizard.sh --force"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -237,6 +237,12 @@ if [ "$DID_GITHUB" -eq 1 ] || [ "$DID_GITEA" -eq 1 ]; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif command -v gh >/dev/null 2>&1 || command -v tea >/dev/null 2>&1; then
|
||||
# gh and/or tea are installed but neither is actually logged in yet (login
|
||||
# was declined, failed, or never completed) - say why the key-generation
|
||||
# question above got skipped instead of just silently not asking.
|
||||
echo "Skipping SSH/GPG key setup: not logged in to GitHub or Gitea yet."
|
||||
echo "Log in (gh auth login / tea login add) then re-run: bash /opt/coder/cli-setup-wizard.sh --force"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -237,6 +237,12 @@ if [ "$DID_GITHUB" -eq 1 ] || [ "$DID_GITEA" -eq 1 ]; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif command -v gh >/dev/null 2>&1 || command -v tea >/dev/null 2>&1; then
|
||||
# gh and/or tea are installed but neither is actually logged in yet (login
|
||||
# was declined, failed, or never completed) - say why the key-generation
|
||||
# question above got skipped instead of just silently not asking.
|
||||
echo "Skipping SSH/GPG key setup: not logged in to GitHub or Gitea yet."
|
||||
echo "Log in (gh auth login / tea login add) then re-run: bash /opt/coder/cli-setup-wizard.sh --force"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -237,6 +237,12 @@ if [ "$DID_GITHUB" -eq 1 ] || [ "$DID_GITEA" -eq 1 ]; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif command -v gh >/dev/null 2>&1 || command -v tea >/dev/null 2>&1; then
|
||||
# gh and/or tea are installed but neither is actually logged in yet (login
|
||||
# was declined, failed, or never completed) - say why the key-generation
|
||||
# question above got skipped instead of just silently not asking.
|
||||
echo "Skipping SSH/GPG key setup: not logged in to GitHub or Gitea yet."
|
||||
echo "Log in (gh auth login / tea login add) then re-run: bash /opt/coder/cli-setup-wizard.sh --force"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -17,6 +17,19 @@ ENV LANG=en_US.UTF-8 \
|
||||
LANGUAGE=en_US:en \
|
||||
LC_ALL=en_US.UTF-8
|
||||
|
||||
# Google Chrome (stable), for the Browse Lite VS Code extension's embedded
|
||||
# browser preview. Ubuntu's own `chromium-browser` apt package is just a
|
||||
# snap wrapper and doesn't work in a container (no snapd) - Google's own
|
||||
# .deb is the reliable way to get a real Chrome binary here. amd64 only
|
||||
# (Google doesn't publish a Chrome .deb for arm64), which matches this
|
||||
# repo's single x86_64 Docker host.
|
||||
RUN curl -fsSL https://dl.google.com/linux/linux_signing_key.pub \
|
||||
| gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg \
|
||||
&& echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" \
|
||||
> /etc/apt/sources.list.d/google-chrome.list \
|
||||
&& apt-get update && apt-get install -y google-chrome-stable \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Core build toolchain, crypto/DB headers, Tauri 2 / WebKit GUI prerequisites,
|
||||
# X11 dev libs, DB CLI clients, Python + OpenCV, protobuf compiler.
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
|
||||
@@ -237,6 +237,12 @@ if [ "$DID_GITHUB" -eq 1 ] || [ "$DID_GITEA" -eq 1 ]; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif command -v gh >/dev/null 2>&1 || command -v tea >/dev/null 2>&1; then
|
||||
# gh and/or tea are installed but neither is actually logged in yet (login
|
||||
# was declined, failed, or never completed) - say why the key-generation
|
||||
# question above got skipped instead of just silently not asking.
|
||||
echo "Skipping SSH/GPG key setup: not logged in to GitHub or Gitea yet."
|
||||
echo "Log in (gh auth login / tea login add) then re-run: bash /opt/coder/cli-setup-wizard.sh --force"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user