Merge pull request #6 from datarockets/a-few-moments-later

Major migrate to devcontainer spec plush refreshing the approach

Author: ezhlobo

.github/dependabot.yml

@@ -0,0 +1,29 @@
+name: release-features
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - features/**
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Publish features
+        uses: devcontainers/action@v1
+        with:
+          publish-features: "true"
+          base-path-to-features: "./features"
+          generate-docs: "true"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -0,0 +1,33 @@
+name: release-image
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - image/**
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./image
+          push: true
+          tags: ghcr.io/${{ github.repository_owner }}/devcontainer:latest

.github/workflows/release-features.yml

@@ -0,0 +1,39 @@
+name: release-template
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - template/**
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check version consistency
+        run: |
+          TEMPLATE_VERSION=$(jq -r '.version' template/devcontainer-template.json)
+          DEVCONTAINER_VERSION=$(cat template/.devcontainer/VERSION | tr -d '[:space:]')
+          if [ "$TEMPLATE_VERSION" != "$DEVCONTAINER_VERSION" ]; then
+            echo "Version mismatch: devcontainer-template.json has '$TEMPLATE_VERSION' but .devcontainer/VERSION has '$DEVCONTAINER_VERSION'"
+            exit 1
+          fi
+          echo "Versions match: $TEMPLATE_VERSION"
+
+      - name: Publish template
+        uses: devcontainers/action@v1
+        with:
+          publish-templates: "true"
+          base-path-to-templates: "./template"
+          generate-docs: "true"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-image.yml

@@ -0,0 +1,7 @@
+# To avoid duplicates with template's content
+/.claude
+/.opencode
+/.devcontainer
+/bin
+
+/tmp

.github/workflows/release-template.yml

@@ -2,66 +2,42 @@
 
 We use devcontainer to develop our fully dockerized projects.
 
-It allows us to use Visual Studio Code's developing inside a container feature for project with multiple services.
+## Prerequisites
 
-## Fully dockerized projects
+1. Have [datarockets/dotfiles](https://github.com/datarockets/dotfiles) installed
+2. Have [datarockets/dotai](https://github.com/datarockets/dotai) installed
 
-We use docker-compose for setting up dockerized projects. Every service of the dockerized project exists in its own container with all the dependencies (npm packages, ruby gems). If we avoid duplicating dependencies on developer's local machine it means we loose and ability to do many of the things in our IDE, like debugging or linting or formatting.
+> [!NOTE]
+> Both can be skipped, but will require to tweak your `devcontainer.json`.
 
-Visual Studio Code supports ["developing inside a container"](https://code.visualstudio.com/docs/remote/containers). It allows us to attach to a container and run, in example, linter right inside the container. This is one of the ways to go: you start your services with docker-compose, attach to a running container and perform debugging there, here is a [proof of concept](https://github.com/datarockets/vscode-docker-compose-poc).
+## Usage example
 
-This approach with attaching to different containers has a number of limitation: 1) if you have multiple services you need to open a multiple vscode windows attached to different containers to work on different services simultaneously; 2) you still will miss some of the IDE features, like git integration (we don't have git installed in service container and mounting .git folder wont work since we don't mount all the service folder in one particular service container), and embedded terminal.
+Setup devcontainer in your project from the template:
 
-Instead of attaching to service containers serparately, we add one more service "devcontainer" to the docker-compose.yml and attach to it with vscode. We mount the whole project folder with all the services to "devcontainer" as well, we also mount dependencies folders for every service so they become available and runnable in the devcontainer. It allows us to run linters and tests the same way we would do if we have all the dependencies installed on developer's machine.
-
-See an [example](examples/ruby-api-with-spa-frontend) for a project that uses Ruby for API and [dreact](https://github.com/datarockets/dreact) for frontend.
-
-We use official images (e.g. [node](https://hub.docker.com/_/node)) for service containers but we install compilers and interpreters using [asdf](https://asdf-vm.com/) in the devcontainer. We have to be conscious about installing the same version of compiler or interpreter in the devcontainer in order to avoid possible problems.
-
-
-## Limitations
-
-We have to use the same OS for service containers and for devcontainer, e.g. Debian Bullseye. This is because different OS may use different system dependencies which highly influence how we build native parts of our dependencies for different services. E.g. Alpine linux uses musl when Debian uses glibc and gem's native extensions compiled in Alpine-based container aren't runnable in Debian container.
-
-
-## Tags
-
-We have [base container](#base-container-with-dev-tools-buster) with some tools installed. You can inherit from it and install any needed compilers and interpreters additionally, using asdf.
-
-Compiling interpreters and compilers takes some CPU time so we also have a number of pre-built containers for our stacks: [Rails API with SPA frontend](#rails-api-with-spa-frontend-node-node_version-ruby-ruby_version-buster).
-
-### Base container with dev tools: `bullseye`
-
-[ghcr.io/datarockets/devcontainer:bullseye](https://ghcr.io/datarockets/devcontainer:bullseye).
-
-It has a number of tools for development installed: doas, git, vim, tmux, ping. See [`Dockerfile`](Dockerfile) for more information.
-
-You can inherit your own devcontainer from it and install any wanted dependencies you need:
-
-```Dockerfile
-ARG DOTFILES_REPO="https://github.com/datarockets/dotfiles.git"
-ARG DOTFILES_INSTALL_COMMAND="RCRC=$HOME/.dotfiles/rcrc rcup"
-FROM ghcr.io/datarockets/devcontainer:bullseye
-
-RUN apt-get install postgresql postgresql-contrib
-
-USER dev
-SHELL ["/bin/zsh", "-ic"]
-
-RUN asdf asdf plugin-add ruby; \
-    asdf install ruby 3.0.1; \
-    asdf global ruby 3.0.1
+```bash
+devcontainer templates apply -t ghcr.io/datarockets/devcontainer/template:latest
 ```
 
-Having postgresql installed in the devcontainer will allow you to use `psql`.
+Use directly in your `devcontainer.json`:
 
-### Rails API with SPA frontend: `node-NODE_VERSION-ruby-RUBY_VERSION-bullseye`
+```json
+{
+  "image": "ghcr.io/datarockets/devcontainer:latest",
+  "features": {
+    // Makes your host docker socket available in the container
+    "ghcr.io/datarockets/devcontainer/feature-with-docker": {},
 
-[ghcr.io/datarockets/devcontainer:node-18.9.0-ruby-3.1.2-bullseye](https://ghcr.io/datarockets/devcontainer:node-18.9.0-ruby-3.1.2-bullseye)
+    // Keeps .local directory in container persistent as a volume (project level)
+    "ghcr.io/datarockets/devcontainer/feature-mount-perproject-dotlocal": {},
 
-See the [buld.yml](.github/workflows/build.yml#L36-L37) for Ruby and Node versions available.
+    // Keeps some cache files in container persistent as a volume (host level)
+    "ghcr.io/datarockets/devcontainer/feature-mount-permachine-caches": {},
 
+    // Binds your overrides of dotfiles to container (dotfiles themselves are already in container)
+    "ghcr.io/datarockets/devcontainer/feature-mount-dotfiles-local": {},
 
-## Contribution
-
-Feel free to create issues and propose pull requests.
+    // Binds your dotai files
+    "ghcr.io/datarockets/devcontainer/feature-mount-dotai": {},
+  },
+}
+```