Skip to content

Commit

Permalink
Merge branch 'eero/consolidate-config-scripts' into 'master'
Browse files Browse the repository at this point in the history
Consolidate config scripts

 

See merge request dfinity-lab/public/ic!11835
  • Loading branch information
Bownairo committed May 5, 2023
2 parents 6d3a372 + 893363d commit d1a6e61
Show file tree
Hide file tree
Showing 17 changed files with 448 additions and 1,585 deletions.
1 change: 1 addition & 0 deletions ic-os/BUILD.bazel
@@ -1,4 +1,5 @@
exports_files([
"vuln-scan/vuln-scan.sh",
"vuln-scan/vuln-scan.html",
"scripts/build-bootstrap-config-image.sh",
])
5 changes: 2 additions & 3 deletions ic-os/guestos/BUILD.bazel
Expand Up @@ -11,7 +11,6 @@ exports_files([
"rootfs/dev-certs/canister_http_test_ca.cert",
"rootfs/dev-certs/canister_http_test_ca.key",
"rootfs/opt/ic/share/ic.json5.template",
"scripts/build-bootstrap-config-image.sh",
])

filegroup(
Expand Down Expand Up @@ -40,7 +39,7 @@ genrule(
"//rs/ic_os/launch-single-vm",
"//ic-os/guestos/envs/dev:disk-img-url",
"//ic-os/guestos/envs/dev:disk-img.tar.zst.sha256",
"//ic-os/guestos:scripts/build-bootstrap-config-image.sh",
"//ic-os:scripts/build-bootstrap-config-image.sh",
"//bazel:version.txt",
],
outs = ["launch_single_vm_script"],
Expand All @@ -49,7 +48,7 @@ BIN="$(location //rs/ic_os/launch-single-vm:launch-single-vm)"
VERSION="$$(cat $(location //bazel:version.txt))"
URL="$$(cat $(location //ic-os/guestos/envs/dev:disk-img-url))"
SHA="$$(cat $(location //ic-os/guestos/envs/dev:disk-img.tar.zst.sha256))"
SCRIPT="$(location //ic-os/guestos:scripts/build-bootstrap-config-image.sh)"
SCRIPT="$(location //ic-os:scripts/build-bootstrap-config-image.sh)"
cat <<EOF > $@
#!/usr/bin/env bash
set -euo pipefail
Expand Down
302 changes: 0 additions & 302 deletions ic-os/guestos/scripts/build-bootstrap-config-image.sh

This file was deleted.

0 comments on commit d1a6e61

Please sign in to comment.