Merge pull request 'feat: manage local docker registries' (#4) from benvin/local-docker into main

Reviewed-on: #4

README.md

@@ -1,3 +1,11 @@
 # terraform-artifactapi
 
-Terraform configuration for managing ArtifactAPI remote and virtual repositories
+Terraform configuration for managing ArtifactAPI remote, local, and virtual repositories.
+
+Repositories are declared as YAML files under `config/<kind>/<name>.yaml`, where the
+filename is the repository name. `make plan` / `make apply` (via Terragrunt) reconcile
+them against the ArtifactAPI instance.
+
+Kinds: `remote_*` (caching proxies of an upstream), `local_*` (real registries hosted
+directly — `local_docker`, `local_pypi`, `local_rpm`, `local_terraform`), and `virtual`
+(merged views over members of one package type).

config/config.hcl

@@ -57,6 +57,11 @@ locals {
       trimsuffix(basename(file_path), ".yaml") => content
       if startswith(file_path, "local_rpm/")
     }
+    local_docker = {
+      for file_path, content in local.all_configs :
+      trimsuffix(basename(file_path), ".yaml") => content
+      if startswith(file_path, "local_docker/")
+    }
     virtual = {
       for file_path, content in local.all_configs :
       trimsuffix(basename(file_path), ".yaml") => content

config/local_docker/docker-internal.yaml

@@ -0,0 +1 @@
+description: "Internal container image registry"

environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl

@@ -27,5 +27,6 @@ inputs = {
   local_terraform = local.config.local_terraform
   local_pypi      = local.config.local_pypi
   local_rpm       = local.config.local_rpm
+  local_docker    = local.config.local_docker
   virtual         = local.config.virtual
 }

modules/artifactapi/main.tf

@@ -110,6 +110,13 @@ resource "artifactapi_local_rpm" "this" {
   description = each.value.description
 }
 
+resource "artifactapi_local_docker" "this" {
+  for_each = var.local_docker
+
+  name        = each.key
+  description = each.value.description
+}
+
 resource "artifactapi_virtual" "this" {
   for_each = var.virtual
 

modules/artifactapi/variables.tf

@@ -120,6 +120,14 @@ variable "local_terraform" {
   default = {}
 }
 
+variable "local_docker" {
+  description = "Map of local Docker repositories (real container registries)"
+  type = map(object({
+    description = optional(string, "")
+  }))
+  default = {}
+}
+
 variable "virtual" {
   description = "Map of virtual repositories"
   type = map(object({

modules/artifactapi/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     artifactapi = {
       source  = "artifactapi.k8s.syd1.au.unkin.net/terraform-unkin/artifactapi"
-      version = ">= 0.1.2"
+      version = "0.1.3"
     }
   }
 }