From f06f968cb5a076edb2bbabfcf731b22d8712eb93 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 17 Jul 2023 17:26:12 +0000 Subject: [PATCH 1/2] chore: add jq to base image --- scripts/Dockerfile.base | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index 878f44adf707b..bb9da1e68ce77 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -7,17 +7,18 @@ FROM alpine:3.18.2 # NOTE: Keep the Terraform version in sync with minTerraformVersion and # maxTerraformVersion in provisioner/terraform/install.go. RUN apk add --no-cache \ - curl \ - wget \ - bash \ - git \ - openssh-client && \ + curl \ + wget \ + bash \ + jq \ + git \ + openssh-client && # Use the edge repo, since Terraform doesn't seem to be backported to 3.18. apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \ - terraform=~1.5 && \ + terraform=~1.5 && addgroup \ -g 1000 \ - coder && \ + coder && adduser \ -D \ -s /bin/bash \ From 60b3c1791084c346f440c3b275d561826a271986 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 17 Jul 2023 17:29:48 +0000 Subject: [PATCH 2/2] fix formatting --- scripts/Dockerfile.base | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/Dockerfile.base b/scripts/Dockerfile.base index bb9da1e68ce77..171857e5d0e27 100644 --- a/scripts/Dockerfile.base +++ b/scripts/Dockerfile.base @@ -7,18 +7,18 @@ FROM alpine:3.18.2 # NOTE: Keep the Terraform version in sync with minTerraformVersion and # maxTerraformVersion in provisioner/terraform/install.go. RUN apk add --no-cache \ - curl \ - wget \ - bash \ - jq \ - git \ - openssh-client && + curl \ + wget \ + bash \ + jq \ + git \ + openssh-client && \ # Use the edge repo, since Terraform doesn't seem to be backported to 3.18. apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \ - terraform=~1.5 && + terraform=~1.5 && \ addgroup \ -g 1000 \ - coder && + coder && \ adduser \ -D \ -s /bin/bash \