Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/docker/hashicorp/terraform-1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
obs-gh-colinhutchinson authored Nov 3, 2023
2 parents ebfbe39 + 73a42bd commit a8af577
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM hashicorp/terraform:1.6@sha256:9ea0e6ed0e17da57ac1a5cc2ff0e5503e6eb90b8eeb6ca9808a9b345beba5d98 as terraform-source

# Your original Dockerfile starts here with some modifications
FROM ruby:3.2-bookworm@sha256:0520a5494639036a5fdc3a7328f7378d841c41a4347da57ffe51259cf1c9de06
FROM ruby:3.2-bookworm@sha256:39d33ab3b46dbfd84609871cf56364d36ba2d9b12731f6bc2fc04afd5274b9d8

# Copy Terraform binary from terraform-source
COPY --from=terraform-source /bin/terraform /usr/local/bin/
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.828.0)
aws-partitions (1.843.0)
aws-sdk (3.1.0)
aws-sdk-resources (~> 3)
aws-sdk-accessanalyzer (1.39.0)
Expand Down Expand Up @@ -273,7 +273,7 @@ GEM
aws-sdk-controltower (1.7.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.183.1)
aws-sdk-core (3.185.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -1394,8 +1394,8 @@ GEM
aws-sdk-vpclattice (1.6.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-waf (1.55.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sdk-waf (1.56.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sigv4 (~> 1.1)
aws-sdk-wafregional (1.55.0)
aws-sdk-core (~> 3, >= 3.177.0)
Expand Down Expand Up @@ -1428,7 +1428,7 @@ GEM
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sigv2 (1.1.0)
aws-sigv4 (1.6.0)
aws-sigv4 (1.6.1)
aws-eventstream (~> 1, >= 1.0.2)
aws_config (0.1.0)
awsecrets (1.15.1)
Expand Down

0 comments on commit a8af577

Please sign in to comment.