ci: update container and build files

fix makefile, fix dockerfile heredoc, add devcontainer extension, remove version from compose file

Author: pythoninthegrass

.devcontainer/devcontainer.json

@@ -30,13 +30,12 @@
         "foxundermoon.shell-format",
         "GitHub.copilot-chat",
         "GitHub.copilot",
-        "jetpack-io.devbox",
         "mads-hartmann.bash-ide-vscode",
         "mechatroner.rainbow-csv",
         "ms-azuretools.vscode-docker",
+        "ms-python.debugpy",
         "ms-python.python",
         "ms-vscode.atom-keybindings",
-        "redhat.ansible",
         "redhat.vscode-yaml",
         "ryu1kn.partial-diff",
         "timonwong.shellcheck",
@@ -50,7 +49,6 @@
     "ghcr.io/devcontainers/features/sshd:1": {},
     "ghcr.io/joshuanianji/devcontainer-features/github-cli-persistence:1": {},
     "ghcr.io/audacioustux/devcontainers/taskfile:1": {},
-    "ghcr.io/nikobockerman/devcontainer-features/poetry-persistent-cache:1": {},
     "ghcr.io/va-h/devcontainers-features/uv:1": {}
   },
   "forwardPorts": [

Dockerfile

@@ -1,16 +1,16 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.7.0
 
 # full semver just for python base image
-ARG PYTHON_VERSION=3.11.9
+ARG PYTHON_VERSION=3.11.11
 
 FROM python:${PYTHON_VERSION}-slim-bullseye AS builder
 
 # avoid stuck build due to user prompt
 ARG DEBIAN_FRONTEND=noninteractive
 
 # update apt-get repos and install dependencies
-RUN apt-get -qq update && apt-get -qq install \
-    --no-install-recommends -y \
+RUN apt-get -qq update \
+    && apt-get -qq install --no-install-recommends -y \
     curl \
     gcc \
     libpq-dev \
@@ -24,26 +24,29 @@ ENV PIP_DEFAULT_TIMEOUT=100
 
 # poetry env vars
 ENV POETRY_HOME="/opt/poetry"
-ENV POETRY_VERSION=1.8.3
+ENV POETRY_VERSION=1.8.5
 ENV POETRY_VIRTUALENVS_IN_PROJECT=true
 ENV POETRY_NO_INTERACTION=1
 
 # path
 ENV VENV="/opt/venv"
 ENV PATH="$POETRY_HOME/bin:$VENV/bin:$PATH"
 
+# create app directory and set as working directory
 WORKDIR /app
 
+# copy dependencies
 COPY requirements.txt requirements.txt
 
+# install poetry and dependencies
 RUN python -m venv $VENV \
     && . "${VENV}/bin/activate" \
     && python -m pip install "poetry==${POETRY_VERSION}" \
     && python -m pip install -r requirements.txt
 
 FROM python:${PYTHON_VERSION}-slim-bullseye AS dev
 
-ENV HOSTNAME="${HOST:-localhost}"
+# setup path
 ENV VENV="/opt/venv"
 ENV PATH="${VENV}/bin:${VENV}/lib/python${PYTHON_VERSION}/site-packages:/usr/local/bin:${HOME}/.local/bin:/bin:/usr/bin:/usr/share/doc:$PATH"
 
@@ -61,8 +64,8 @@ ENV WEB_CONCURRENCY=2
 ARG DEBIAN_FRONTEND=noninteractive
 
 # install dependencies
-RUN apt-get -qq update && apt-get -qq install \
-    --no-install-recommends -y \
+RUN apt-get -qq update \
+    && apt-get -qq install --no-install-recommends -y \
     bat \
     curl \
     dpkg \
@@ -73,6 +76,7 @@ RUN apt-get -qq update && apt-get -qq install \
     p7zip \
     perl \
     shellcheck \
+    sudo \
     tldr \
     tree \
     && rm -rf /var/lib/apt/lists/*
@@ -85,45 +89,55 @@ ARG USER_GID=$USER_UID
 RUN groupadd --gid $USER_GID $USER_NAME \
     && useradd --uid $USER_UID --gid $USER_GID -m $USER_NAME
 
+RUN echo "$USER_NAME ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER_NAME \
+    && chmod 0440 /etc/sudoers.d/$USER_NAME
+
+# copy virtual environment from builder stage
 COPY --from=builder --chown=${USER_NAME}:${USER_GROUP} $VENV $VENV
 
 # qol: tooling
 RUN <<EOF
 #!/usr/bin/env bash
-# gh
-curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-apt-get update && apt-get install --no-install-recommends gh -y
-apt-get remove dpkg -y
-rm -rf /var/lib/apt/lists/*
-
 # fzf
 git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf
 yes | ~/.fzf/install
 EOF
 
+# switch to non-root user
 USER $USER_NAME
 
 # qol: .bashrc
-RUN tee -a "$HOME/.bashrc" <<EOF
+RUN tee -a "$HOME/.bashrc" <<"EOF"
+
 # shared history
 HISTFILE=/var/tmp/.bash_history
 HISTFILESIZE=100
 HISTSIZE=100
 
 stty -ixon
 
+# fzf
 [ -f ~/.fzf.bash ] && . ~/.fzf.bash
 
+# asdf
+# https://asdf-vm.com/guide/getting-started.html
+export ASDF_DIR="$HOME/.asdf"
+[[ -f "${ASDF_DIR}/asdf.sh" ]] && . "${ASDF_DIR}/asdf.sh"
+
+# homebrew
+export BREW_PREFIX="/home/linuxbrew/.linuxbrew/bin"
+[[ -f "${BREW_PREFIX}/brew" ]] && eval "$(${BREW_PREFIX}/brew shellenv)"
+
 # aliases
 alias ..='cd ../'
 alias ...='cd ../../'
 alias ll='ls -la --color=auto'
+
 EOF
 
 FROM dev AS runner
 
+# change working directory
 WORKDIR /app
 
 # $PATH
@@ -132,6 +146,8 @@ ENV PATH=$VENV_PATH/bin:$HOME/.local/bin:$PATH
 # port needed by app
 EXPOSE 8000
 
+# run container indefinitely
 CMD ["sleep", "infinity"]
 
-LABEL org.opencontainers.image.title="mvp"
+# metadata
+LABEL org.opencontainers.image.title="python-class"

Makefile

@@ -7,7 +7,7 @@
 # ENV VARS
 export SHELL := $(shell which sh)
 export UNAME := $(shell uname -s)
-export ASDF_VERSION := v0.13.1
+export ASDF_VERSION := v0.15.0
 
 # check commands and OS
 ifeq ($(UNAME), Darwin)
@@ -75,7 +75,7 @@ ifeq ($(UNAME), Darwin)
 		echo "brew already installed."; \
 	fi
 else ifeq ($(UNAME), Linux)
-	@if [ "${ID_LIKE}" = "debian" ]; then \
+	@if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then \
 		if ! command -v brew >/dev/null 2>&1; then \
 			echo "Installing Homebrew..."; \
 			NONINTERACTIVE=1 /bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"; \

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     container_name: mvp-app