Merge pull request #1447 from lorengordon/fix/image-user

Author: lorengordon

.github/workflows/build.yml

@@ -72,6 +72,13 @@ jobs:
           secrets: |
             "GITHUB_ACCESS_TOKEN=${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Run docker lint
+        if: github.event_name == 'pull_request'
+        env:
+          IMAGE_NAME: plus3it/tardigrade-ci:test
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: make docker/run target="lint"
+
       - name: Run bats tests
         if: github.event_name == 'pull_request'
         run: docker run --rm -e "GITHUB_ACCESS_TOKEN=${{ secrets.GITHUB_TOKEN }}" plus3it/tardigrade-ci:test bats/test

.github/workflows/dependabot_hack.yml

@@ -24,6 +24,6 @@ jobs:
 
       - uses: astral-sh/uv@0.11.2
 
-      - uses: gruntwork-io/terragrunt@5.14.1
+      - uses: gruntwork-io/terragrunt@0.99.5
 
       - uses: stedolan/jq@jq-1.8.1

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
     * python 3.14.3
     * rclone 1.73.3
     * terragrunt 0.99.5
-    * uv 0.11.1
+    * uv 0.11.2
     * yq 4.52.5
 
 ### [0.28.7](https://github.com/plus3it/tardigrade-ci/releases/tag/0.28.7)

CHANGELOG.md

@@ -45,6 +45,9 @@ ENV TF_PLUGIN_CACHE_DIR=${HOME}/.terraform.d/plugin-cache
 
 RUN mkdir -p "$TF_PLUGIN_CACHE_DIR"
 
+RUN git config --global --add safe.directory /workdir \
+    && git config --global --add safe.directory /${PROJECT_NAME}
+
 RUN --mount=type=secret,id=GITHUB_ACCESS_TOKEN,mode=0400,uid=1000,gid=1000 \
     GITHUB_ACCESS_TOKEN="$(cat /run/secrets/GITHUB_ACCESS_TOKEN)" \
     make -C /${PROJECT_NAME} install/build

Dockerfile

@@ -545,7 +545,6 @@ docker/run: export target ?= help
 docker/run: export entrypoint ?= entrypoint.sh
 docker/run: export DOCKER_USERNS ?=
 docker/run: | guard/env/TARDIGRADE_CI_PATH guard/env/TARDIGRADE_CI_PROJECT
-docker/run: docker/build
 	@echo "[$@]: Running docker image"
 	userns=""; \
 	if docker --version 2>/dev/null | grep -qi podman; then userns="--userns=keep-id"; elif [ -n "$(DOCKER_USERNS)" ]; then userns="--userns=$(DOCKER_USERNS)"; fi; \
@@ -627,7 +626,7 @@ lint/install: pytest/install terraform/install terraform-docs/install cfn-lint/i
 lint/install: ec/install shellcheck/install jq/install yamllint/install
 
 install: lint/install
-install: rclone/install packer/install
+install: rclone/install packer/install terragrunt/install
 
 ## Installs tools for container image using only uv-managed Python runtimes
 install/build: