diff --git a/images/fluentd/14.tf b/images/fluentd/14.tf deleted file mode 100644 index ac7982a904..0000000000 --- a/images/fluentd/14.tf +++ /dev/null @@ -1,32 +0,0 @@ -module "fourteen" { - source = "../../tflib/publisher" - - target_repository = var.target_repository - config = file("${path.module}/configs/latest.apko.yaml") -} - -module "fourteen-dev" { - source = "../../tflib/publisher" - - target_repository = var.target_repository - # Make the dev variant an explicit extension of the - # locked original. - config = jsonencode(module.fourteen.config) - extra_packages = local.fluentd_dev -} - -module "version-tags-14" { - source = "../../tflib/version-tags" - package = "ruby3.2-fluentd14" - config = module.fourteen.config -} - -module "test-fourteen" { - source = "./tests" - digest = module.fourteen.image_ref -} - -module "test-fourteen-dev" { - source = "./tests" - digest = module.fourteen-dev.image_ref -} diff --git a/images/fluentd/15.tf b/images/fluentd/15.tf deleted file mode 100644 index b8e143df50..0000000000 --- a/images/fluentd/15.tf +++ /dev/null @@ -1,32 +0,0 @@ -module "fifteen" { - source = "../../tflib/publisher" - - target_repository = var.target_repository - config = file("${path.module}/configs/edge.apko.yaml") -} - -module "fifteen-dev" { - source = "../../tflib/publisher" - - target_repository = var.target_repository - # Make the dev variant an explicit extension of the - # locked original. - config = jsonencode(module.fifteen.config) - extra_packages = local.fluentd_dev -} - -module "version-tags-15" { - source = "../../tflib/version-tags" - package = "ruby3.2-fluentd15" - config = module.fifteen.config -} - -module "test-fifteen" { - source = "./tests" - digest = module.fifteen.image_ref -} - -module "test-fifteen-dev" { - source = "./tests" - digest = module.fifteen-dev.image_ref -} diff --git a/images/fluentd/configs/edge.apko.yaml b/images/fluentd/configs/edge.apko.yaml deleted file mode 100644 index e2daeede85..0000000000 --- a/images/fluentd/configs/edge.apko.yaml +++ /dev/null @@ -1,55 +0,0 @@ -contents: - packages: - - glibc - - ruby3.2-fluentd15 - -entrypoint: - type: service-bundle - services: - fluentd: /usr/bin/fluentd - -environment: - FLUENTD_CONF: "fluent.conf" - LD_PRELOAD: "" - -accounts: - groups: - - groupname: fluent - gid: 65532 - users: - - username: fluent - uid: 65532 - gid: 65532 - run-as: 65532 - -paths: - - path: /fluentd/log - type: directory - uid: 65532 - gid: 65532 - permissions: 0o755 - - - path: /fluentd/etc - type: directory - uid: 65532 - gid: 65532 - permissions: 0o755 - - - path: /fluentd/plugins - type: directory - uid: 65532 - gid: 65532 - permissions: 0o755 - - # Set the fluent.conf to an empty file so the image doesn't fail when - # no options are supplied - - path: /etc/fluent/fluent.conf - type: empty-file - uid: 65532 - gid: 65532 - permissions: 0o644 - -annotations: - "org.opencontainers.image.authors": "Chainguard Team https://www.chainguard.dev/" - "org.opencontainers.image.url": https://edu.chainguard.dev/chainguard/chainguard-images/reference/fluentd - "org.opencontainers.image.source": https://github.com/chainguard-images/images/tree/main/images/fluentd diff --git a/images/fluentd/configs/latest.apko.yaml b/images/fluentd/configs/latest.apko.yaml index a1a18b78a6..bdfac60b9f 100644 --- a/images/fluentd/configs/latest.apko.yaml +++ b/images/fluentd/configs/latest.apko.yaml @@ -1,6 +1,6 @@ contents: packages: - - ruby3.2-fluentd14 + - ruby3.2-fluentd entrypoint: type: service-bundle diff --git a/images/fluentd/main.tf b/images/fluentd/main.tf index 5379c8208e..db20c3798f 100644 --- a/images/fluentd/main.tf +++ b/images/fluentd/main.tf @@ -22,17 +22,48 @@ module "tagger" { source = "../../tflib/tagger" depends_on = [ - module.test-fourteen, - module.test-fourteen-dev, - module.test-fifteen, - module.test-fifteen-dev, + module.test-latest, + module.test-latest-dev, ] tags = merge( - { for t in toset(concat(["edge"], module.version-tags-15.tag_list)) : t => module.fifteen.image_ref }, - { for t in toset(concat(["edge"], module.version-tags-15.tag_list)) : "${t}-dev" => module.fifteen-dev.image_ref }, + { for t in toset(concat(["edge"], module.version-tags-latest.tag_list)) : t => module.latest.image_ref }, + { for t in toset(concat(["edge"], module.version-tags-latest.tag_list)) : "${t}-dev" => module.latest-dev.image_ref }, - { for t in toset(concat(["latest"], module.version-tags-14.tag_list)) : t => module.fourteen.image_ref }, - { for t in toset(concat(["latest"], module.version-tags-14.tag_list)) : "${t}-dev" => module.fourteen-dev.image_ref }, + { for t in toset(concat(["latest"], module.version-tags-latest.tag_list)) : t => module.latest.image_ref }, + { for t in toset(concat(["latest"], module.version-tags-latest.tag_list)) : "${t}-dev" => module.latest-dev.image_ref }, ) } + +module "latest" { + source = "../../tflib/publisher" + + target_repository = var.target_repository + config = file("${path.module}/configs/latest.apko.yaml") +} + +module "latest-dev" { + source = "../../tflib/publisher" + + target_repository = var.target_repository + # Make the dev variant an explicit extension of the + # locked original. + config = jsonencode(module.latest.config) + extra_packages = local.fluentd_dev +} + +module "version-tags-latest" { + source = "../../tflib/version-tags" + package = "ruby3.2-fluentd" + config = module.latest.config +} + +module "test-latest" { + source = "./tests" + digest = module.latest.image_ref +} + +module "test-latest-dev" { + source = "./tests" + digest = module.latest-dev.image_ref +}