Merge remote-tracking branch 'upstream/master' into feature/add-init-to-service

* upstream/master:
  chore: Replace git-chglog with git-cliff (kreuzwerker#904)
  feat: Implement docker registry image tags data source (kreuzwerker#903)
  Fix flaky `docker_container` destroy by disabling link removal during delete (kreuzwerker#902)
  Normalize `docker_service` `max_failure_ratio` diffs to prevent `0` vs `0.0` drift (kreuzwerker#901)
  Fix `docker_container.container_logs` to return demultiplexed log content (kreuzwerker#899)
  feat: Add docker import action (kreuzwerker#900)
  docs: add missing docker_exec/buildx examples and align action name to docker_exec (kreuzwerker#898)
  feat: Expose attached container network addresses in `docker_network` data source (kreuzwerker#897)
  chore: Prepare release 4.1.0 (kreuzwerker#896)
  Prevent `docker_container` read panic with CDI `device_requests` by hardening device flattening (kreuzwerker#895)
  Add Plugin Framework `docker_containers` data source for Docker container enumeration (kreuzwerker#893)
  Fix `docker_service` platform flattening hash to prevent platform list drift on updates (kreuzwerker#892)
  fix: Make container deletion idempotent for missing containers (kreuzwerker#891)
  fix(deps): update module github.com/containerd/platforms to v1.0.0-rc.4 (kreuzwerker#889)
  Avoid `docker_container` replacement when only daemon default `log_opts` are present (kreuzwerker#888)
  Add `platform` support to `docker_container` for cross-architecture emulation (kreuzwerker#886)
  Allow `docker_registry_image.auth_config` to mirror provider `registry_auth` optional credentials (kreuzwerker#887)
  feat: Implement docker_exec action (kreuzwerker#885)
  chore: Prepare 4.0.0 release (kreuzwerker#884)
  feat: add selinux_relabel attribute to docker_container volumes (kreuzwerker#883)

Author: mx-moth

.github/copilot-instructions.md

@@ -0,0 +1,23 @@
+# Copilot Instructions
+
+When Go code is touched, run:
+
+```bash
+make fmt
+```
+
+before finalizing changes.
+
+When documentation-related schemas or generated provider/resource/data-source docs are impacted, run:
+
+```bash
+make website-generation
+```
+
+before finalizing changes, and include the generated documentation updates in the same PR.
+
+Further instructions:
+* commit messages should be in the format of `<type>(<scope>): <subject>`, where:
+  * `<type>` is one of `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`
+  * `<scope>` is optional and can be the name of the package or module being changed
+  * `<subject>` is a brief description of the change, ideally less than 50 characters

.github/workflows/acc-test.yaml

@@ -229,7 +229,7 @@ jobs:
         env:
           TF_LOG: INFO
           TF_ACC: 1
-        run: DOCKER_HOST=${{ steps.setup-docker.outputs.sock}} go test -v ./internal/provider -timeout ${{ env.TESTSUITE_TIMEOUT }} -run ${{ matrix.resource_type }}
+        run: DOCKER_HOST=${{ steps.setup-docker.outputs.sock}} go test -v ./internal/... -timeout ${{ env.TESTSUITE_TIMEOUT }} -run ${{ matrix.resource_type }}
       - name: Cleanup acceptance tests
         run: make testacc_cleanup
         if: ${{ matrix.registry }}

.github/workflows/semantic-pr-title.yaml

@@ -0,0 +1,27 @@
+name: Semantic PR Title
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  validate-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate PR title
+        env:
+          TITLE: ${{ github.event.pull_request.title }}
+        run: |
+          if ! printf '%s\n' "$TITLE" | grep -Eq '^(feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert)(\([^)]+\))?(!)?:[[:space:]].+'; then
+            cat <<'EOF'
+          PR title must follow Conventional Commits, for example:
+          feat: add registry image tags data source
+          fix(provider): handle missing auth config
+          EOF
+            exit 1
+          fi

CHANGELOG.md

@@ -24,11 +24,10 @@ Please use issue templates as much as possible.
 
 Prerequisites:
 
-- `make`, `git`, `bash`
+- `make`, `git`, `bash`, `brew`
 - [Go 1.22+](https://golang.org/doc/install)
 - [Docker](https://www.docker.com/)
 - [Terraform 0.12+](https://terraform.io/)
-- [git-chglog](https://github.com/git-chglog/git-chglog)
 - [svu](https://github.com/caarlos0/svu)
 
 Clone `terraform-provider-docker` anywhere:
@@ -196,5 +195,5 @@ make major
 
 Those commands will automatically:
 - Replace all occurrences of the latest release, e.g. `2.11.0` with the new one, e.g. `2.12.0`: ``
-- Generate the `CHANGELOG.md`
+- Generate the `CHANGELOG.md` with `git cliff`
 - Regenerate the website (`make website-generation`)

CONTRIBUTING.md

@@ -30,6 +30,7 @@ setup:
 	go install github.com/katbyte/terrafmt
 	go install github.com/client9/misspell/cmd/misspell
 	go install github.com/golangci/golangci-lint/cmd/golangci-lint
+	brew install git-cliff
 	rm -f .git/hooks/commit-msg \
 	&& curl --fail -o .git/hooks/commit-msg https://raw.githubusercontent.com/hazcod/semantic-commit-hook/master/commit-msg \
 	&& chmod 500 .git/hooks/commit-msg
@@ -107,7 +108,7 @@ website-lint-fix:
 
 chlog-%:
 	@echo "Generating CHANGELOG.md"
-	git-chglog --next-tag $* -o CHANGELOG.md
+	git cliff --config cliff.toml --tag $* --output CHANGELOG.md
 	@echo "Version updated to $*!"
 	@echo
 	@echo "Review the changes made by this script then execute the following:"

GNUmakefile

@@ -13,7 +13,9 @@
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/kreuzwerker/terraform-provider-docker/blob/main/LICENSE)  
 [![Go Status](https://github.com/kreuzwerker/terraform-provider-docker/workflows/Acc%20Tests/badge.svg)](https://github.com/kreuzwerker/terraform-provider-docker/actions)
 [![Lint Status](https://github.com/kreuzwerker/terraform-provider-docker/workflows/golangci-lint/badge.svg)](https://github.com/kreuzwerker/terraform-provider-docker/actions)
-[![Go Report Card](https://goreportcard.com/badge/github.com/kreuzwerker/terraform-provider-docker)](https://goreportcard.com/report/github.com/kreuzwerker/terraform-provider-docker)  
+[![Go Report Card](https://goreportcard.com/badge/github.com/kreuzwerker/terraform-provider-docker)](https://goreportcard.com/report/github.com/kreuzwerker/terraform-provider-docker)
+
+Sponsored by [Coder](https://coder.com/)
 
 ## Documentation
 
@@ -26,7 +28,7 @@ Migration guides:
 
 ## Example usage
 
-Take a look at the examples in the [documentation](https://registry.terraform.io/providers/kreuzwerker/docker/3.9.0/docs) of the registry
+Take a look at the examples in the [documentation](https://registry.terraform.io/providers/kreuzwerker/docker/4.1.0/docs) of the registry
 or use the following example:
 
 
@@ -38,7 +40,9 @@ terraform {
     # since new versions are released frequently
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.9.0"
+      # or if you want to pull from opentfu
+      source = "registry.opentofu.org/kreuzwerker/docker"
+      version = "4.1.0"
     }
   }
 }
@@ -115,3 +119,7 @@ The Terraform Provider Docker is available to everyone under the terms of the Mo
 ## Stargazers over time
 
 [![Stargazers over time](https://starchart.cc/kreuzwerker/terraform-provider-docker.svg)](https://starchart.cc/kreuzwerker/terraform-provider-docker)
+
+## Sponsors
+
+[![Coder](https://avatars.githubusercontent.com/u/95932066?s=100&v=2)](https://coder.com/)

README.md

@@ -0,0 +1,47 @@
+[changelog]
+header = "Changelog"
+body = """
+{% if version %}
+<a name="{{ version }}"></a>
+## {% if previous %}[{{ version }}](https://github.com/kreuzwerker/terraform-provider-docker/compare/{{ previous.version }}...{{ version }}){% else %}{{ version }}{% endif %} ({{ timestamp | date(format="%Y-%m-%d") }})
+
+{% endif %}
+{% for group, commits in commits | group_by(attribute="group") %}
+### {{ group }}
+{% for commit in commits %}
+* {{ commit.message
+    | split(pat="\n")
+    | first }}{% if commit.links %} ({% for link in commit.links %}[{{ link.text }}]({{ link.href }}){% if not loop.last %} {% endif %}{% endfor %}){% endif %}
+{% endfor %}
+{% endfor %}
+"""
+footer = ""
+trim = true
+render_always = false
+output = "CHANGELOG.md"
+
+[git]
+conventional_commits = true
+filter_unconventional = false
+tag_pattern = "^v?\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$"
+link_parsers = [
+  { pattern = "#(\\d+)", href = "https://github.com/kreuzwerker/terraform-provider-docker/issues/$1" },
+]
+commit_parsers = [
+  { message = "^feat", group = "Feat" },
+  { message = "^Feat", group = "Feat" },
+  { message = "^Add", group = "Feat" },
+  { message = "^Allow", group = "Feat" },
+  { message = "^fix", group = "Fix" },
+  { message = "^Fix", group = "Fix" },
+  { message = "^Normalize", group = "Fix" },
+  { message = "^docs?", group = "Docs" },
+  { message = "^refactor", group = "Refactor" },
+  { message = "^perf", group = "Perf" },
+  { message = "^test", group = "Test" },
+  { message = "^chore", group = "Chore" },
+  { message = "^build", group = "Build" },
+  { message = "^ci", group = "Ci" },
+  { message = "^revert", skip = true },
+  { message = ".*", group = "Other", default_scope = "other" },
+]

cliff.toml

@@ -0,0 +1,58 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "docker_exec Action - terraform-provider-docker"
+subcategory: ""
+description: |-
+  Run a command in an existing container, similar to docker container exec. Please note that due to the nature of actions, we cannot have an computed output attribute that contains the command output.
+---
+
+# docker_exec (Action)
+
+Run a command in an existing container, similar to `docker container exec`. Please note that due to the nature of actions, we cannot have an computed `output` attribute that contains the command output.
+
+## Example Usage
+
+```terraform
+resource "docker_image" "busybox" {
+  name = "busybox:1.35.0"
+}
+
+resource "docker_container" "target" {
+  name     = "docker-exec-example"
+  image    = docker_image.busybox.image_id
+  must_run = true
+  command  = ["sh", "-c", "sleep 300"]
+
+  lifecycle {
+    action_trigger {
+      events  = [after_create]
+      actions = [action.docker_exec.create_file]
+    }
+  }
+}
+
+action "docker_exec" "create_file" {
+  config {
+    container = docker_container.target.name
+    command   = ["sh", "-c", "touch /tmp/created-by-action"]
+  }
+}
+```
+
+<!-- action schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `command` (List of String) Command and arguments to execute inside the container.
+- `container` (String) Container name or ID where the command is executed.
+
+### Optional
+
+- `detach` (Boolean) Run command in the background.
+- `env` (List of String) Set environment variables for the command (`KEY=value` or `KEY`).
+- `env_file` (List of String) Read in environment variables from files.
+- `privileged` (Boolean) Give extended privileges to the command.
+- `tty` (Boolean) Allocate a pseudo-TTY.
+- `user` (String) Username or UID (format: `<name|uid>[:<group|gid>]`).
+- `workdir` (String) Working directory inside the container.

docs/actions/exec.md

@@ -0,0 +1,55 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "docker_image_import Action - terraform-provider-docker"
+subcategory: ""
+description: |-
+  Import a tar archive or URL as a Docker image, similar to docker image import.
+---
+
+# docker_image_import (Action)
+
+Import a tar archive or URL as a Docker image, similar to `docker image import`.
+
+## Example Usage
+
+```terraform
+## The following code performs an `docker image import` whenever the `import.tar` file changes
+
+resource "terraform_data" "bootstrap" {
+  triggers_replace = [
+    filesha512("./import.tar")
+  ]
+
+  lifecycle {
+    action_trigger {
+      events  = [after_update]
+      actions = [action.docker_image_import.import_export]
+    }
+  }
+}
+
+
+action "docker_image_import" "import_export" {
+  config {
+    source    = pathexpand("./import.tar")
+    reference = "example-imported-image:latest"
+    message   = "imported from a tar archive"
+    changes   = ["CMD [\"sh\"]"]
+    platform  = "linux/amd64"
+  }
+}
+```
+
+<!-- action schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `reference` (String) Image name and optional tag to apply to the imported image, for example `my-image:latest`.
+- `source` (String) Path to a local tar archive or an http(s) URL containing the filesystem to import.
+
+### Optional
+
+- `changes` (List of String) Raw Dockerfile instructions to apply to the imported image.
+- `message` (String) Optional message to store with the imported image.
+- `platform` (String) Platform to assign to the imported image.