fix: fix conditional execution of chained build/install commands

flexstack · May 17, 2024 · 92054dc · 92054dc
1 parent cb97976
commit 92054dc
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/runtime/bun.go b/runtime/bun.go
@@ -144,17 +144,15 @@ FROM base AS deps
 WORKDIR /app
 COPY package.json bun.lockb ./
 ARG INSTALL_CMD="bun install"
-ENV INSTALL_CMD=${INSTALL_CMD}
-RUN if [ ! -z "${INSTALL_CMD}" ]; then $INSTALL_CMD; fi
+RUN if [ ! -z "${INSTALL_CMD}" ]; then sh -c "$INSTALL_CMD"; fi
 
 FROM base AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules* ./node_modules
 COPY . .
 ENV NODE_ENV=production
 ARG BUILD_CMD={{.BuildCMD}}
-ENV BUILD_CMD=${BUILD_CMD}
-RUN  if [ ! -z "${BUILD_CMD}" ]; then $BUILD_CMD; fi
+RUN  if [ ! -z "${BUILD_CMD}" ]; then sh -c "$BUILD_CMD"; fi
 
 FROM oven/bun:${VERSION}-slim AS runtime
 WORKDIR /app

diff --git a/runtime/deno.go b/runtime/deno.go
@@ -192,8 +192,7 @@ USER nonroot:nonroot
 
 ENV PORT=8080
 ARG INSTALL_CMD={{.InstallCMD}}
-ENV INSTALL_CMD=${INSTALL_CMD}
-RUN if [ ! -z "${INSTALL_CMD}" ]; then $INSTALL_CMD; fi
+RUN if [ ! -z "${INSTALL_CMD}" ]; then sh -c "$INSTALL_CMD"; fi
 
 ARG START_CMD={{.StartCMD}}
 ENV START_CMD=${START_CMD}

diff --git a/runtime/java.go b/runtime/java.go
@@ -151,7 +151,7 @@ COPY src src
 RUN mvn install
 
 ARG BUILD_CMD={{.BuildCMD}}
-RUN if [ ! -z "${BUILD_CMD}" ]; then ${BUILD_CMD}; fi
+RUN if [ ! -z "${BUILD_CMD}" ]; then sh -c "$BUILD_CMD"; fi
 
 FROM eclipse-temurin:${VERSION}-jdk AS runtime
 WORKDIR /app
@@ -185,7 +185,7 @@ COPY gradle/ ./gradle/
 COPY src src
 
 ARG BUILD_CMD={{.BuildCMD}}
-RUN if [ ! -z "${BUILD_CMD}" ]; then ${BUILD_CMD}; fi
+RUN if [ ! -z "${BUILD_CMD}" ]; then sh -c "$BUILD_CMD"; fi
 
 FROM eclipse-temurin:${VERSION}-jdk AS runtime
 WORKDIR /app

diff --git a/runtime/node.go b/runtime/node.go
@@ -180,7 +180,7 @@ COPY --from=deps /app/node_modules* ./node_modules
 COPY . .
 ENV NODE_ENV=production
 ARG BUILD_CMD={{.BuildCMD}}
-RUN  if [ ! -z "${BUILD_CMD}" ]; then $BUILD_CMD; fi
+RUN  if [ ! -z "${BUILD_CMD}" ]; then sh -c "$BUILD_CMD"; fi
 
 FROM base AS runtime
 WORKDIR /app

diff --git a/runtime/php.go b/runtime/php.go
@@ -145,8 +145,8 @@ COPY . .
 
 ARG INSTALL_CMD={{.InstallCMD}}
 ARG BUILD_CMD={{.BuildCMD}}
-RUN if [ ! -z "${INSTALL_CMD}" ]; then echo "${INSTALL_CMD}" > dep.sh; sh dep.sh; fi
-RUN if [ ! -z "${BUILD_CMD}" ]; then $BUILD_CMD; fi
+RUN if [ ! -z "${INSTALL_CMD}" ]; then sh -c "$INSTALL_CMD"; fi
+RUN if [ ! -z "${BUILD_CMD}" ]; then sh -c "$BUILD_CMD"; fi
 
 FROM php:${VERSION}-apache AS runtime
 

diff --git a/runtime/python.go b/runtime/python.go
@@ -167,7 +167,7 @@ RUN chown -R nonroot:nonroot /app
 
 COPY --chown=nonroot:nonroot . .
 ARG INSTALL_CMD={{.InstallCMD}}
-RUN if [ ! -z "${INSTALL_CMD}" ]; then echo "${INSTALL_CMD}" > dep.sh; sh dep.sh;  fi
+RUN if [ ! -z "${INSTALL_CMD}" ]; then sh -c "$INSTALL_CMD";  fi
 
 ENV PORT=8080
 ENV PYTHONDONTWRITEBYTECODE=1

diff --git a/runtime/ruby.go b/runtime/ruby.go
@@ -143,8 +143,8 @@ ENV NODE_ENV=production
 RUN chown -R nonroot:nonroot /app
 COPY --chown=nonroot:nonroot . .
 
-RUN if [ ! -z "${INSTALL_CMD}" ]; then echo "${INSTALL_CMD}" > dep.sh; sh dep.sh;  fi
-RUN  if [ ! -z "${BUILD_CMD}" ]; then $BUILD_CMD; fi
+RUN if [ ! -z "${INSTALL_CMD}" ]; then sh -c "$INSTALL_CMD";  fi
+RUN  if [ ! -z "${BUILD_CMD}" ]; then sh -c "$BUILD_CMD"; fi
 
 ENV PORT=8080
 USER nonroot:nonroot

diff --git a/runtime/rust.go b/runtime/rust.go
@@ -97,6 +97,7 @@ func (d *Rust) GenerateDockerfile(path string) ([]byte, error) {
 }
 
 var rustlangTemplate = strings.TrimSpace(`
+ARG BUILDPLATFORM=linux
 FROM --platform=${BUILDPLATFORM} messense/cargo-zigbuild:latest AS build
 WORKDIR /app
 COPY . .