feat: better conditional syntax in src dockerfile

Author: lotyp

Makefile

@@ -78,7 +78,7 @@ ssh: ## Login into built image
 .PHONY: ssh
 
 hadolint:  ## Run hadolint over dist Dockerfiles
-	hadolint -V ./dist/alpine/Dockerfile
+	hadolint -V ./dist/$(TEMPLATE)/Dockerfile
 .PHONY: hadolint
 
 

README.md

@@ -26,9 +26,11 @@ This image is used together with [wayofdev/docker-php-dev](https://github.com/wa
 Has pre-installed packages
 
 * [pnpm](https://pnpm.io/) — Fast, disk space efficient package manager
+* [turbo](https://github.com/vercel/turbo) — Incremental bundler and build system optimized for JavaScript and TypeScript, written in Rust – including Turbopack and Turborepo.
 * alpine packages:
   * git
   * curl
+  * libc6-compat — [turbo dependency](https://github.com/vercel/turbo/issues/2198), starting from `^1.5.6`
 
 If you **like/use** this repository, please consider **starring** it. Thanks!
 
@@ -57,7 +59,8 @@ $ make generate
 Building default image:
 
 ```bash
-$ git clone [email protected]:wayofdev/docker-node.git
+$ git clone [email protected]:wayofdev/docker-node.git && cd docker-node
+$ make generate #(optional, to re-create /dist from /src)
 $ make build
 ```
 
@@ -70,6 +73,7 @@ $ make
 Building all images:
 
 ```bash
+$ make build TEMPLATE="lts-alpine"
 $ make build TEMPLATE="19-alpine"
 $ make build TEMPLATE="18-alpine"
 ```
@@ -87,6 +91,7 @@ $ make test
 To test all images:
 
 ```bash
+$ make test TEMPLATE="lts-alpine"
 $ make test TEMPLATE="19-alpine"
 $ make test TEMPLATE="18-alpine"
 ```

assets/screenshot.png

@@ -22,20 +22,12 @@ RUN set -eux; \
   apk add --no-cache \
     curl \
     git \
-    # For vercel/turbo
     libc6-compat \
-  && /bin/ash -c 'set -ex && \
-    ARCH=`uname -m` && \
-      if [ "$ARCH" == "x86_64" ]; then \
-        echo "x86_64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
-      elif [ "ARCH" == "arm64" ]; then \
-        echo "arm64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      else \
-         echo "unknown arch" && \
-         curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      fi' \
+  && ARCH=$(uname -m) &&  \
+    if [ "$ARCH" = "x86_64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+    elif [ "$ARCH" == "aarch64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+    fi \
   && chmod +x /bin/pnpm \
-  # https://github.com/vercel/turbo/issues/2198
   && yarn global add turbo

dist/18-alpine/Dockerfile

@@ -22,20 +22,12 @@ RUN set -eux; \
   apk add --no-cache \
     curl \
     git \
-    # For vercel/turbo
     libc6-compat \
-  && /bin/ash -c 'set -ex && \
-    ARCH=`uname -m` && \
-      if [ "$ARCH" == "x86_64" ]; then \
-        echo "x86_64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
-      elif [ "ARCH" == "arm64" ]; then \
-        echo "arm64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      else \
-         echo "unknown arch" && \
-         curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      fi' \
+  && ARCH=$(uname -m) &&  \
+    if [ "$ARCH" = "x86_64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+    elif [ "$ARCH" == "aarch64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+    fi \
   && chmod +x /bin/pnpm \
-  # https://github.com/vercel/turbo/issues/2198
   && yarn global add turbo

dist/19-alpine/Dockerfile

@@ -22,20 +22,12 @@ RUN set -eux; \
   apk add --no-cache \
     curl \
     git \
-    # For vercel/turbo
     libc6-compat \
-  && /bin/ash -c 'set -ex && \
-    ARCH=`uname -m` && \
-      if [ "$ARCH" == "x86_64" ]; then \
-        echo "x86_64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
-      elif [ "ARCH" == "arm64" ]; then \
-        echo "arm64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      else \
-         echo "unknown arch" && \
-         curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      fi' \
+  && ARCH=$(uname -m) &&  \
+    if [ "$ARCH" = "x86_64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+    elif [ "$ARCH" == "aarch64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+    fi \
   && chmod +x /bin/pnpm \
-  # https://github.com/vercel/turbo/issues/2198
   && yarn global add turbo

dist/lts-alpine/Dockerfile

@@ -22,20 +22,12 @@ RUN set -eux; \
   apk add --no-cache \
     curl \
     git \
-    # For vercel/turbo
     libc6-compat \
-  && /bin/ash -c 'set -ex && \
-    ARCH=`uname -m` && \
-      if [ "$ARCH" == "x86_64" ]; then \
-        echo "x86_64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
-      elif [ "ARCH" == "arm64" ]; then \
-        echo "arm64" && \
-        curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      else \
-         echo "unknown arch" && \
-         curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
-      fi' \
+  && ARCH=$(uname -m) &&  \
+    if [ "$ARCH" = "x86_64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; \
+    elif [ "$ARCH" == "aarch64" ]; then \
+      curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-arm64" -o /bin/pnpm; \
+    fi \
   && chmod +x /bin/pnpm \
-  # https://github.com/vercel/turbo/issues/2198
   && yarn global add turbo