Merge pull request #319 from asciidoctor/updatecli_76bad28f077b4b3950…

…821c3d4ca2a66f6d63710041462e2a9c79e17f06629a7c

Bump Alpine Linux Version to 3.17.0

Dockerfile

@@ -1,4 +1,4 @@
-ARG alpine_version=3.16.3
+ARG alpine_version=3.17.0
 FROM alpine:${alpine_version} AS base
 
 ARG asciidoctor_version=2.0.18
@@ -46,10 +46,10 @@ RUN apk add --no-cache ruby \
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Haskell build for: erd
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Alpine 3.16 is the last known working version for building erd (dynamic linking)
+FROM alpine:3.16 AS erd-builder
 
-FROM base AS build-haskell
-
-## Always use the latest Cabal (and dependencies) versions available for the current Alpine distribution
+## Always use the latest dependencies available for the current Alpine distribution
 # hadolint ignore=DL3018
 RUN apk add --no-cache \
   alpine-sdk \
@@ -70,7 +70,6 @@ RUN apk add --no-cache \
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Final image
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
 FROM main-minimal AS main
 RUN echo "assemble comprehensive main image" # keep here to help --cache-from along
 
@@ -139,7 +138,7 @@ RUN apk add --no-cache \
   seqdiag \
   && apk del -r --no-cache .pythonmakedepends
 
-COPY --from=build-haskell root/.cabal/bin/erd     /bin/
+COPY --from=erd-builder /root/.cabal/bin/erd /bin/
 
 WORKDIR /documents
 VOLUME /documents

Makefile

@@ -11,13 +11,13 @@ PANDOC_VERSION ?= 2.10.1
 
 all: build test README
 
-build: asciidoctor-minimal.build build-haskell.build asciidoctor.build
+build: asciidoctor-minimal.build erd-builder.build asciidoctor.build
 
 %.build:
 	docker buildx bake $(*) --load --set '*.cache-to=""' --print
 	docker buildx bake $(*) --load --set '*.cache-to=""'
 
-docker-cache: asciidoctor-minimal.docker-cache build-haskell.docker-cache asciidoctor.docker-cache
+docker-cache: asciidoctor-minimal.docker-cache erd-builder.docker-cache asciidoctor.docker-cache
 
 %.docker-cache:
 	docker buildx bake $(*) --print

README.adoc

@@ -1,4 +1,4 @@
-:ALPINE_VERSION: 3.16.3
+:ALPINE_VERSION: 3.17.0
 :ASCIIDOCTOR_VERSION: 2.0.18
 :ASCIIDOCTOR_CONFLUENCE_VERSION: 0.0.2
 :ASCIIDOCTOR_PDF_VERSION: 2.3.4

docker-bake.hcl

@@ -13,7 +13,7 @@ variable "IMAGE_NAME" {
 group "all" {
   targets = [
     "asciidoctor-minimal",
-    "build-haskell",
+    "erd-builder",
     "asciidoctor"
   ]
 }
@@ -31,15 +31,15 @@ target "asciidoctor-minimal" {
 }
 
 // This image is only used for intermediate steps
-target "build-haskell" {
+target "erd-builder" {
   dockerfile = "Dockerfile"
   context = "."
-  target = "build-haskell"
+  target = "erd-builder"
   cache-from = [
-    "${CACHE_REGISTRY_PREFIX}/build-haskell:cache",
+    "${CACHE_REGISTRY_PREFIX}/erd-builder:cache",
   ]
   cache-to = [
-    "${CACHE_REGISTRY_PREFIX}/build-haskell:cache",
+    "${CACHE_REGISTRY_PREFIX}/erd-builder:cache",
   ]
 }
 

tests/asciidoctor.bats

@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
 TMP_GENERATION_DIR="${BATS_TEST_DIRNAME}/tmp"
-ALPINE_VERSION=3.16.3
+ALPINE_VERSION=3.17.0
 ASCIIDOCTOR_VERSION=2.0.18
 ASCIIDOCTOR_CONFLUENCE_VERSION=0.0.2
 ASCIIDOCTOR_PDF_VERSION=2.3.4