Skip to content

Commit

Permalink
automated commit
Browse files Browse the repository at this point in the history
Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] committed Dec 11, 2024
1 parent daa2d69 commit 93ef45f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 172 deletions.
9 changes: 8 additions & 1 deletion images/glibc-dynamic/config/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@ variable "extra_packages" {
default = []
}

variable "extra_repositories" {
description = "Extra repositories to add."
type = list(string)
default = []
}

module "accts" { source = "../../../tflib/accts" }

output "config" {
value = jsonencode({
contents = {
packages = concat(["glibc", "libgcc", "libstdc++"], var.extra_packages)
repositories = var.extra_repositories
packages = concat(["glibc", "libgcc", "libstdc++"], var.extra_packages)
}
accounts = module.accts.block
})
Expand Down
101 changes: 0 additions & 101 deletions images/wordpress/config/main.tf

This file was deleted.

2 changes: 1 addition & 1 deletion images/wordpress/generated.tf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 17 additions & 20 deletions images/wordpress/main.tf
Original file line number Diff line number Diff line change
@@ -1,55 +1,52 @@
terraform {
required_providers {
oci = { source = "chainguard-dev/oci" }
}
}

variable "target_repository" {
description = "The docker repo into which the image and attestations should be published."
}

module "php-versions" {
source = "../../tflib/versions/"
package = "php"
source = "../../tflib/versions"
}

module "config" {
source = "./config"
php_version = [for k, v in module.php-versions.versions : k if v.is_latest][0]
source = "./config"
}

module "latest" {
source = "../../tflib/publisher"
config = module.config.config
main_package = "wordpress"
name = basename(path.module)
source = "../../tflib/publisher"
target_repository = var.target_repository
config = module.config.config
}

module "latest-dev" {
source = "../../tflib/publisher"
config = module.config.config-dev
main_package = "wordpress"
name = basename(path.module)
source = "../../tflib/publisher"
target_repository = var.target_repository
config = module.config.config-dev
}

module "test-latest" {
source = "./tests"
digest = module.latest.image_ref
source = "./tests"
}

module "test-latest-dev" {
source = "./tests"
digest = module.latest-dev.image_ref
source = "./tests"
}

resource "oci_tag" "latest" {
module "tagger" {
depends_on = [module.test-latest]
digest_ref = module.latest.image_ref
tag = "latest"
source = "../../tflib/tagger"
tags = module.latest.latest_tag_map
}

resource "oci_tag" "latest-dev" {
module "tagger-dev" {
depends_on = [module.test-latest-dev]
digest_ref = module.latest-dev.image_ref
tag = "latest-dev"
source = "../../tflib/tagger"
tags = module.latest-dev.latest_tag_map
}

1 change: 1 addition & 0 deletions images/wordpress/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ keywords:
tier: APPLICATION
aliases:
- wordpress:latest
public: true
49 changes: 0 additions & 49 deletions images/wordpress/tests/main.tf

This file was deleted.

0 comments on commit 93ef45f

Please sign in to comment.