Merge pull request #14 from vim-denops/fix-build-failure

Modernize build system: Migrate to Debian Bookworm and Docker Compose

Author: lambdalisue

Makefile

@@ -96,13 +96,20 @@ See [examples/ddc.vim](./examples/ddc.vim) for details.
 Build [ghcr.io/vim-denops/vim][] and [ghcr.io/vim-denops/neovim][] with
 
 ```
-make build
+docker compose build
 ```
 
-The push it with
+Then push it with
 
 ```
-make push
+docker compose push
+```
+
+You can also specify the Denops version and Docker tag:
+
+```
+DENOPS_VERSION=v6.0.0 DOCKER_TAG=v6.0.0 docker compose build
+DOCKER_TAG=v6.0.0 docker compose push
 ```
 
 ## License

README.md

@@ -0,0 +1,32 @@
+services:
+  vim:
+    image: ghcr.io/vim-denops/vim:${DOCKER_TAG:-latest}
+    build:
+      context: .
+      dockerfile: dockerfiles/vim
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      args:
+        DENOPS_VERSION: ${DENOPS_VERSION:-main}
+      cache_from:
+        - ghcr.io/vim-denops/vim/cache
+        - ghcr.io/vim-denops/vim
+      cache_to:
+        - type=registry,ref=ghcr.io/vim-denops/vim/cache,mode=max
+
+  neovim:
+    image: ghcr.io/vim-denops/neovim:${DOCKER_TAG:-latest}
+    build:
+      context: .
+      dockerfile: dockerfiles/neovim
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      args:
+        DENOPS_VERSION: ${DENOPS_VERSION:-main}
+      cache_from:
+        - ghcr.io/vim-denops/neovim/cache
+        - ghcr.io/vim-denops/neovim
+      cache_to:
+        - type=registry,ref=ghcr.io/vim-denops/neovim/cache,mode=max

compose.yaml

@@ -1,6 +1,6 @@
 # syntax=docker.io/docker/dockerfile:1.4
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-backports as neovim
+FROM debian:bookworm-backports as neovim
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install requirements
@@ -32,7 +32,7 @@ RUN git clone https://github.com/neovim/neovim \
 
 
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-backports as deno
+FROM debian:bookworm-backports as deno
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install requirements
@@ -50,7 +50,7 @@ RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/opt/deno sh -s ${DEN
 
 
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-backports as denops
+FROM debian:bookworm-backports as denops
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install requirements
@@ -72,15 +72,15 @@ RUN mkdir -p denops.vim \
 
 
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-slim as runtime
+FROM debian:bookworm-slim as runtime
 ENV DEBIAN_FRONTEND=noninteractive
 
 LABEL org.opencontainers.image.url https://github.com/orgs/vim-denops/packages/container/package/neovim
 LABEL org.opencontainers.image.source https://github.com/vim-denops/denops-dockerfile
 
 # Prefer to use Debian Backports
 # https://backports.debian.org/
-RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list
+RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list
 
 # Runtime environment
 ENV LC_ALL=C.UTF-8 \

dockerfiles/neovim

@@ -1,6 +1,6 @@
 # syntax=docker.io/docker/dockerfile:1.4
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-backports as vim
+FROM debian:bookworm-backports as vim
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install requirements
@@ -26,7 +26,7 @@ RUN make install
 
 
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-backports as deno
+FROM debian:bookworm-backports as deno
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install requirements
@@ -44,7 +44,7 @@ RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/opt/deno sh -s ${DEN
 
 
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-backports as denops
+FROM debian:bookworm-backports as denops
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install requirements
@@ -66,15 +66,15 @@ RUN mkdir -p denops.vim \
 
 
 #------------------------------------------------------------------------------------------------------------
-FROM debian:bullseye-slim as runtime
+FROM debian:bookworm-slim as runtime
 ENV DEBIAN_FRONTEND=noninteractive
 
 LABEL org.opencontainers.image.url https://github.com/orgs/vim-denops/packages/container/package/vim
 LABEL org.opencontainers.image.source https://github.com/vim-denops/denops-dockerfile
 
 # Prefer to use Debian Backports
 # https://backports.debian.org/
-RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list
+RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list
 
 # Runtime environment
 ENV LC_ALL=C.UTF-8 \