Skip to content

feat: Added --with-terraform argument to install coder and terraform together #5586

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
merged 7 commits into from
Jan 6, 2023
Merged

feat: Added --with-terraform argument to install coder and terraform together #5586

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82d49db
- Added a `--install-terraform` argument
Jan 5, 2023
d11feae
Merge branch 'main' of https://github.com/coder/coder
Jan 5, 2023
d514c18
- Corrected formatting errors, and renamed functions
Jan 5, 2023
cfd33f9
- Fixed typos
Jan 5, 2023
2869757
Removed unzip check in standalone function
Jan 5, 2023
7d857bb
Fixed styling
Jan 5, 2023
adf4fad
Moved the TERRAFORM_VERSION Var up
Jan 5, 2023
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
Prev Previous commit
Next Next commit
- Corrected formatting errors, and renamed functions
  • Loading branch information
Admin committed Jan 5, 2023
commit d514c18147507fdbfb3343ff72c7b6accb378b9d
16 changes: 8 additions & 8 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Usage:
--rsh <bin>
Specifies the remote shell for remote installation. Defaults to ssh.

--install-terraform
--with-terraform
Installs Terraform binary from https://releases.hashicorp.com/terraform/1.3.4/ source
alongside coder.
This is great for if you are having issues with Coder installing terraform, or if you
Expand Down Expand Up @@ -221,7 +221,7 @@ main() {
usage
exit 0
;;
--install-terraform)
--with-terraform)
METHOD=install_terraform
;;
--)
Expand Down Expand Up @@ -270,7 +270,7 @@ main() {
# result in a broken coder.
OS=${OS:-$(os)}
ARCH=${ARCH:-$(arch)}
TERRA_ARCH=${TERRA_ARCH:-$(terra_arch)}
TERRAFORM_ARCH=${TERRAFORM_ARCH:-$(terraform_arch)}

distro_name

Expand Down Expand Up @@ -377,13 +377,13 @@ install_terraform() {
echoerr "Please install unzip to use this function"
exit 1
fi

echoh "Installing Terraform version 1.3.4 $TERRA_ARCH package from Hashicorp Source."
TERRAFORM_VERSION="1.3.4"
echoh "Installing Terraform version $TERRAFORM_VERSION $TERRAFORM_ARCH package from Hashicorp Source."
echoh

# Download from offical source and save it to cache
fetch "https://releases.hashicorp.com/terraform/1.3.4/terraform_1.3.4_${OS}_${TERRA_ARCH}.zip" \
"$CACHE_DIR/terraform_1.3.4_${OS}_${TERRA_ARCH}.zip"
fetch "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_1.3.4_${OS}_${TERRAFORM_ARCH}.zip" \
"$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${TERRAFORM_ARCH}.zip"

sh_c mkdir -p "$TERRAFORM_INSTALL_PREFIX" 2>/dev/null || true

Expand Down Expand Up @@ -580,7 +580,7 @@ arch() {

# The following is to change the naming, that way people with armv7 won't recieve a error
# List of binaries can be found here: https://releases.hashicorp.com/terraform/1.3.4/
terra_arch() {
terraform_arch() {
uname_m=$(uname -m)
case $uname_m in
aarch64) echo arm64 ;;
Expand Down