[docker][forge] stop using dev_setup.sh and import prepare helm

serbangv · Mar 2, 2022 · 8599452 · 8599452
1 parent 967dcf3
commit 8599452
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docker/forge/Dockerfile b/docker/forge/Dockerfile
@@ -27,8 +27,7 @@ RUN apt-get update && apt-get install -y libssl1.1 openssh-client wget && apt-ge
 
 RUN mkdir /diem
 COPY rust-toolchain /diem/rust-toolchain
-COPY scripts/dev_setup.sh /diem/scripts/dev_setup.sh
-RUN /diem/scripts/dev_setup.sh -b -p -i kubectl -i helm -i git -i unzip -i awscli -i vault
+RUN apt-get install -y kubectl helm git unzip awscli vault
 ENV PATH "$PATH:/root/bin"
 
 RUN helm plugin install https://github.com/hypnoglow/helm-s3.git --version 0.10.0

diff --git a/terraform/testnet/forge.tf b/terraform/testnet/forge.tf
@@ -58,8 +58,9 @@ resource "null_resource" "helm-s3-package" {
     command = <<-EOT
       set -e
       TEMPDIR="$(mktemp -d)"
-      cd ${path.module}/.. # script expects to be called from project root
-      ./scripts/prepare-helm-charts.py "$TEMPDIR" "1.0.0"
+      helm package ${path.module}/testnet -d "$TEMPDIR" --app-version 1.0.0 --version 1.0.0
+      helm package ${path.module}/../helm/validator -d "$TEMPDIR" --app-version 1.0.0 --version 1.0.0
+      helm package ${path.module}/../helm/fullnode -d "$TEMPDIR" --app-version 1.0.0 --version 1.0.0
       helm s3 push --force "$TEMPDIR"/testnet-*.tgz testnet-${terraform.workspace}
       helm s3 push --force "$TEMPDIR"/diem-validator-*.tgz testnet-${terraform.workspace}
       helm s3 push --force "$TEMPDIR"/diem-fullnode-*.tgz testnet-${terraform.workspace}