Parametrize Compose platform and trim Docker image caches

- Add DOCKER_PLATFORM support via shared platform anchor in compose.yaml
  and .env.dist
- Switch Codex/Gemini install to Arch packages via VIM_PACKAGES and
  update README
- Reduce image size by cleaning pacman, pyenv, pip, and poetry caches
  during build

Author: jamm1985

.env.dist

@@ -6,18 +6,18 @@ DOCKER_HOST_UID=1000
 DOCKER_HOST_GID=1000
 DOCKER_USER=developer
 DOCKER_USER_HOME=/home/developer
+DOCKER_PLATFORM=linux/amd64
 
 MIRROR_LIST_COUNTRY=RU
 BUILD_PACKAGES="pyenv git gnupg sudo postgresql-libs mariadb-libs openmp"
-VIM_PACKAGES="python vim ctags ripgrep bat npm nodejs-lts-jod"
-NPM_GLOBAL_PACKAGES="@openai/codex @google/gemini-cli"
+VIM_PACKAGES="python vim ctags ripgrep bat npm nodejs-lts-jod openai-codex gemini-cli"
 
 PYTHON_VERSION=3.14
 PYTHONUNBUFFERED=1
 PIP_DEFAULT_TIMEOUT=100
 POETRY_VERSION=2.2.1
 POETRY_OPTIONS_APP="--only main --compile"
-POETRY_OPTIONS_DEV="--no-root --with-dev --compile"
+POETRY_OPTIONS_DEV="--no-root --with dev --compile"
 POETRY_NO_INTERACTION=1
 
 JUPYTER_TOKEN=_change_me_please_!1_

Dockerfile

@@ -24,13 +24,17 @@ RUN set -eux; \
   | sed -e 's/^\s*#Server/Server/' -e '/^\s*#/d' \
   > /etc/pacman.d/mirrorlist; \
   grep -q '^Server' /etc/pacman.d/mirrorlist
-RUN pacman -Syu --noconfirm && pacman -S --noconfirm --needed $BUILD_PACKAGES
+RUN pacman -Syu --noconfirm && \
+  pacman -S --noconfirm --needed $BUILD_PACKAGES && \
+  pacman -Scc --noconfirm && \
+  rm -rf /var/lib/pacman/sync/*
 RUN echo "${DOCKER_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 ENV PYENV_ROOT=$DOCKER_USER_HOME/.pyenv
 ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
-RUN pyenv install --skip-existing $PYTHON_VERSION
-RUN pyenv global $PYTHON_VERSION
-RUN pyenv rehash
+RUN pyenv install --skip-existing $PYTHON_VERSION && \
+  pyenv global $PYTHON_VERSION && \
+  pyenv rehash && \
+  rm -rf "$PYENV_ROOT/cache" "$PYENV_ROOT/sources" /tmp/python-build*
 ENV PYTHONUNBUFFERED=1
 ENV PIP_DEFAULT_TIMEOUT=100
 ENV POETRY_NO_INTERACTION=1
@@ -64,30 +68,32 @@ ARG POETRY_OPTIONS_APP="--only main --compile"
 RUN poetry install $POETRY_OPTIONS_APP -n -v -C /build && \
   rm -rf $POETRY_CACHE_DIR/* && rm -rf $PIP_CACHE_DIR/*
 RUN sed -i "/\b\($DOCKER_USER\)\b/d" /etc/sudoers
-RUN pacman -Scc --noconfirm
 USER $DOCKER_USER
 WORKDIR /application
 
 FROM python-base AS build-deps-dev
 ARG DOCKER_USER=devuser
+ARG VIM_PACKAGES="python vim ctags ripgrep bat npm nodejs-lts-jod openai-codex gemini-cli"
 ARG POETRY_OPTIONS_DEV="--no-root --with-dev --compile"
+RUN pacman -Sy --noconfirm && \
+  pacman -S --noconfirm --needed $VIM_PACKAGES && \
+  pacman -Scc --noconfirm && \
+  rm -rf /var/lib/pacman/sync/*
 COPY pyproject.toml poetry.lock /build/
-RUN poetry install $POETRY_OPTIONS_DEV -n -v -C /build 
+RUN poetry install $POETRY_OPTIONS_DEV -n -v -C /build && \
+  rm -rf $POETRY_CACHE_DIR/* $PIP_CACHE_DIR/*
 RUN mkdir -p $POETRY_CACHE_DIR $PIP_CACHE_DIR && \
   chown -R $DOCKER_USER $POETRY_CACHE_DIR $PIP_CACHE_DIR
 
 FROM build-deps-dev AS dev-build
 ARG DOCKER_USER=devuser
 USER $DOCKER_USER
 WORKDIR /application
+RUN git config --global --add safe.directory /application
 
 FROM build-deps-dev AS vim-ide
 ARG DOCKER_USER=devuser
 ARG DOCKER_USER_HOME=/home/devuser
-ARG VIM_PACKAGES="python vim ctags ripgrep bat npm nodejs-lts-jod"
-ARG NPM_GLOBAL_PACKAGES=""
-RUN pacman -S --noconfirm --needed $VIM_PACKAGES
-RUN if [ -n "$NPM_GLOBAL_PACKAGES" ]; then npm install -g --no-fund --no-audit $NPM_GLOBAL_PACKAGES; fi
 USER $DOCKER_USER
 RUN curl -fLo $DOCKER_USER_HOME/.vim/autoload/plug.vim --create-dirs \
   https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim

README.md

@@ -64,7 +64,7 @@ Use it as-is or tailor it to match your team's development workflow.
 
 ```bash
 cp .env.dist .env
-vim .env  # Set OS packages, a released PYTHON_VERSION, Poetry version, etc., and your API keys for OPENAI_API_KEY and GEMINI_API_KEY.
+vim .env  # Set OS packages, DOCKER_PLATFORM (if not linux/amd64), a released PYTHON_VERSION, Poetry version, etc., and your API keys for OPENAI_API_KEY and GEMINI_API_KEY.
 ```
 
 2. Set up Python project dependencies
@@ -114,7 +114,7 @@ docker compose run --rm app
 ```
 
 - Optional: Run Codex or Gemini (see more examples below)
-  - Note: `codex` and `gemini` CLIs are installed during the image build via `NPM_GLOBAL_PACKAGES` in `.env`.
+  - Note: `codex` and `gemini` CLIs are installed during the image build via Arch packages (`openai-codex`, `gemini-cli`) configured in `VIM_PACKAGES` inside `.env`.
 
 ```bash
 docker compose build codex

compose.yaml

@@ -3,6 +3,8 @@ x-default-env: &default-env
   PIP_DEFAULT_TIMEOUT: "100"
   PYTHONUNBUFFERED: "1"
 
+x-platform: &platform ${DOCKER_PLATFORM:-linux/amd64}
+
 x-default-args: &default-args
   TZ: ${TZ:-Asia/Vladivostok}
   DOCKER_HOST_UID: ${DOCKER_HOST_UID:-1000}
@@ -11,23 +13,22 @@ x-default-args: &default-args
   DOCKER_USER_HOME: ${DOCKER_USER_HOME:-/home/developer}
   MIRROR_LIST_COUNTRY: ${MIRROR_LIST_COUNTRY:-RU}
   BUILD_PACKAGES: ${BUILD_PACKAGES:-pyenv git gnupg sudo postgresql-libs mariadb-libs openmp}
-  VIM_PACKAGES: ${VIM_PACKAGES:-python vim ctags ripgrep bat npm nodejs-lts-jod}
+  VIM_PACKAGES: ${VIM_PACKAGES:-python vim ctags ripgrep bat npm nodejs-lts-jod openai-codex gemini-cli}
   PYTHON_VERSION: ${PYTHON_VERSION:-3.14}
   POETRY_VERSION: ${POETRY_VERSION:-2.2.1}
   POETRY_OPTIONS_APP: ${POETRY_OPTIONS_APP:---only main --compile}
-  POETRY_OPTIONS_DEV: ${POETRY_OPTIONS_DEV:---no-root --with-dev --compile}
-  NPM_GLOBAL_PACKAGES: ${NPM_GLOBAL_PACKAGES:-}
+  POETRY_OPTIONS_DEV: ${POETRY_OPTIONS_DEV:---no-root --with dev --compile}
 
 services:
   python-base:
-    platform: linux/amd64
+    platform: *platform
     build:
       target: python-base
       args: *default-args
     environment:
       <<: *default-env
   poetry:
-    platform: linux/amd64
+    platform: *platform
     entrypoint: poetry
     build:
       target: poetry
@@ -45,7 +46,7 @@ services:
         source: poetry-cache
         target: /var/cache/pypoetry
   vim-ide:
-    platform: linux/amd64
+    platform: *platform
     entrypoint: vim
     build:
       target: vim-ide
@@ -59,10 +60,10 @@ services:
         source: .
         target: /application
   gemini:
-    platform: linux/amd64
+    platform: *platform
     entrypoint: gemini
     build:
-      target: vim-ide
+      target: dev-build
       args: *default-args
     environment:
       <<: *default-env
@@ -72,10 +73,10 @@ services:
         source: .
         target: /application
   codex:
-    platform: linux/amd64
+    platform: *platform
     entrypoint: codex
     build:
-      target: vim-ide
+      target: dev-build
       args: *default-args
     environment:
       <<: *default-env
@@ -85,7 +86,7 @@ services:
         source: .
         target: /application
   jupyterlab:
-    platform: linux/amd64
+    platform: *platform
     entrypoint:
       - jupyter-lab
       - --port=8888
@@ -104,7 +105,7 @@ services:
         source: .
         target: /application
   app:
-    platform: linux/amd64
+    platform: *platform
     entrypoint: template_bin
     build:
       target: app-build