Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitceff9a5

Browse files
sreyablink-so[bot]
authored andcommitted
Follow-up: restore blank line and comments per review\n\n- install.sh: add blank line after esac\n- dogfood Dockerfile: restore Terraform comment lines\n\nCo-authored-by: deansheather <376117+deansheather@users.noreply.github.com>
1 parent47323f2 commitceff9a5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

‎dogfood/coder/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirrors.edge.kernel.org/u
207207
# Configure FIPS-compliant policies
208208
update-crypto-policies --set FIPS
209209

210-
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.13.0.
210+
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.12.2.
211+
# Installing the same version here to match.
211212
RUN wget -O /tmp/terraform.zip"https://releases.hashicorp.com/terraform/1.13.0/terraform_1.13.0_linux_amd64.zip" && \
212213
unzip /tmp/terraform.zip -d /usr/local/bin && \
213214
rm -f /tmp/terraform.zip && \
@@ -222,7 +223,7 @@ RUN DOCKER_BUILDX_VERSION=$(curl -s "https://api.github.com/repos/docker/buildx/
222223

223224
# See https://github.com/cli/cli/issues/6175#issuecomment-1235984381 for proof
224225
# the apt repository is unreliable
225-
RUN GH_CLI_VERSION=$(curl -s"https://api.github.com/repos/cli/cli/releases/latest" | grep'"tag_name":' | sed -E's/.*"v([^"]+)".*/\1/') && \
226+
RUN GH_CLI_VERSION=$(curl -s"https://api.github.com/repos/cli/cli/releases/latest" | grep'"tag_name":' | sed -E's/.*"(v[^"]+)".*/\1/') && \
226227
curl -L https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.deb -o gh.deb && \
227228
dpkg -i gh.deb && \
228229
rm gh.deb

‎install.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ with_terraform() {
585585
fi
586586
# Prepare /usr/local/bin/ and the binary for copying
587587
"$sh_c" mkdir -p"$TERRAFORM_INSTALL_PREFIX/bin"
588-
"$sh_c" unzip -d"$CACHE_DIR" -o"$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${ARCH}.zip"
588+
"$sh_c" unzip -d"$CACHE_DIR" -o"$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${TERRAFORM_ARCH}.zip"
589589
COPY_LOCATION="$TERRAFORM_INSTALL_PREFIX/bin/terraform"
590590

591591
# Remove the file if it already exists to
@@ -657,6 +657,7 @@ install_standalone() {
657657
darwin) STANDALONE_ARCHIVE_FORMAT=zip ;;
658658
*) STANDALONE_ARCHIVE_FORMAT=tar.gz ;;
659659
esac
660+
660661
fetch"https://github.com/coder/coder/releases/download/v$VERSION/coder_${VERSION}_${OS}_${ARCH}.$STANDALONE_ARCHIVE_FORMAT" \
661662
"$CACHE_DIR/coder_${VERSION}_${OS}_${ARCH}.$STANDALONE_ARCHIVE_FORMAT"
662663

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp