Merge pull request #2 from Intellection/builder-phase5h-git-with-lfs

[SRE-5664] Phase 5h: Add Git and Git LFS to builder image

Author: itskingori

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0
+
+* Install `git` and `git-lfs`.
+* Set up `builder` user and group with UID and GID of `65533`.
+
 ## 1.0.0
 
 * Use Ubuntu 24.04 (LTS) as upstream base image.

Dockerfile

@@ -8,7 +8,9 @@ ARG TARGETARCH
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y \
         ca-certificates \
-        curl && \
+        curl \
+        git \
+        git-lfs && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Docker
@@ -36,8 +38,8 @@ RUN cd /tmp && \
 
 # Create user
 ARG APP_USER="builder"
-RUN groupadd -g 1001 ${APP_USER} && \
-    useradd --create-home -u 1001 -g 1001 ${APP_USER}
+RUN groupadd -g 65533 ${APP_USER} && \
+    useradd --create-home -u 65533 -g 65533 ${APP_USER}
 
 WORKDIR /home/${APP_USER}
 USER ${APP_USER}:${APP_USER}

README.md

@@ -1,6 +1,6 @@
 # Docker Image Builder
 
-A purpose-built image for building and pushing container images via remote [BuildKit](https://github.com/moby/buildkit) daemons. It carries only what is needed for this role — no Docker Engine daemon, no `git`, no build toolchains.
+A purpose-built image for building and pushing container images via remote [BuildKit](https://github.com/moby/buildkit) daemons. It carries only what is needed for this role — no Docker Engine daemon and no general build toolchains.
 
 Published to Docker Hub as [`zappi/image-builder`](https://hub.docker.com/r/zappi/image-builder). Built for `linux/amd64` and `linux/arm64`.
 
@@ -9,11 +9,15 @@ Published to Docker Hub as [`zappi/image-builder`](https://hub.docker.com/r/zapp
 | Component | Version |
 |-----------|---------|
 | Base image | Ubuntu 24.04 LTS |
+| [Git](https://git-scm.com/) | distro package |
+| [Git LFS](https://git-lfs.com/) | distro package |
 | [Docker CLI](https://github.com/docker/cli) | 29.3.0 |
 | [Docker Buildx plugin](https://github.com/docker/buildx) | 0.31.1 |
 | [Amazon ECR Credential Helper](https://github.com/awslabs/amazon-ecr-credential-helper) | 0.12.0 |
 
-The image runs as a non-root `builder` user (UID/GID `1001`).
+`git` and `git-lfs` are included as part of the builder toolchain.
+
+The image runs as a non-root `builder` user (UID/GID `65533`).
 
 ## Docker CLI Configuration
 
@@ -42,4 +46,6 @@ Images are tagged and pushed to Docker Hub on every [GitHub Release](https://git
 
 - [docker/cli](https://github.com/docker/cli)
 - [docker/buildx](https://github.com/docker/buildx)
+- [git/git](https://github.com/git/git)
+- [git-lfs/git-lfs](https://github.com/git-lfs/git-lfs)
 - [awslabs/amazon-ecr-credential-helper](https://github.com/awslabs/amazon-ecr-credential-helper)