Merge https://github.com/cisagov/skeleton-packer into lineage/skeleton

# Conflicts: # README.md
cisagov · Dec 12, 2024 · fa2d5c3 · fa2d5c3
2 parents 1581299 + 82a9528
commit fa2d5c3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -127,8 +127,12 @@ ansible-galaxy install --force --force-with-deps --role-file src/requirements.ym
 AWS_PROFILE=cool-images-ec2amicreate-ubuntu-server-packer packer build --timestamp-ui -var release_tag=$(./bump_version.sh show) -var is_prerelease=true src/packer.pkr.hcl
 =======
 ansible-galaxy install --force --force-with-deps --role-file ansible/requirements.yml
+<<<<<<< HEAD
 AWS_PROFILE=cool-images-ec2amicreate-skeleton-packer packer build --timestamp-ui -var release_tag=$(./bump-version show) -var is_prerelease=true packer.pkr.hcl
 >>>>>>> eb4508ae171c9c5821faca1b9fc96759767a2c53
+=======
+AWS_PROFILE=cool-images-ec2amicreate-skeleton-packer packer build --timestamp-ui -var release_tag=$(./bump-version show) -var is_prerelease=true .
+>>>>>>> 82a95282f3768450eacb5b4d88a4f104fe5da305
 ```
 
 If you are satisfied with your pre-release image, you can easily create a release
@@ -146,10 +150,14 @@ region_kms_keys = {
 
 ```console
 <<<<<<< HEAD
+<<<<<<< HEAD
 AWS_PROFILE=cool-images-ec2amicreate-ubuntu-server-packer packer build --timestamp-ui -var-file release.pkrvars.hcl src/packer.pkr.hcl
 =======
 AWS_PROFILE=cool-images-ec2amicreate-skeleton-packer packer build --timestamp-ui -var-file release.pkrvars.hcl packer.pkr.hcl
 >>>>>>> eb4508ae171c9c5821faca1b9fc96759767a2c53
+=======
+AWS_PROFILE=cool-images-ec2amicreate-skeleton-packer packer build --timestamp-ui -var-file release.pkrvars.hcl .
+>>>>>>> 82a95282f3768450eacb5b4d88a4f104fe5da305
 ```
 
 ### Giving Other AWS Accounts Permission to Launch the Image ###