Skip to content

Commit

Permalink
fix: use if..elif..else in docker examples (#39072)
Browse files Browse the repository at this point in the history
* fix: use `if..elif..else` in docker examples

* fix missing devDependencies for build

Co-authored-by: JJ Kasper <jj@jjsweb.site>
  • Loading branch information
balazsorban44 and ijjk committed Jul 27, 2022
1 parent 0ebd53f commit 0a781dd
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 24 deletions.
Expand Up @@ -6,10 +6,11 @@ WORKDIR /app
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
# Omit --production flag for TypeScript devDependencies
RUN \
[ -f yarn.lock ] && yarn install --frozen-lockfile || \
[ -f package-lock.json ] && npm ci || \
[ -f pnpm-lock.yaml ] && yarn global add pnpm && pnpm fetch && pnpm i -r --offline || \
(echo "Lockfile not found." && exit 1)
if [ -f yarn.lock ] then yarn install --frozen-lockfile; \
elif [ -f package-lock.json ] then npm ci; \
elif [ -f pnpm-lock.yaml ] then yarn global add pnpm && pnpm i; \
else echo "Lockfile not found." && exit 1; \
fi

COPY src ./src
COPY public ./public
Expand Down
9 changes: 5 additions & 4 deletions examples/with-docker-compose/next-app/prod.Dockerfile
Expand Up @@ -7,10 +7,11 @@ WORKDIR /app
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
# Omit --production flag for TypeScript devDependencies
RUN \
[ -f yarn.lock ] && yarn install --frozen-lockfile || \
[ -f package-lock.json ] && npm ci || \
[ -f pnpm-lock.yaml ] && yarn global add pnpm && pnpm fetch && pnpm i -r --offline || \
(echo "Lockfile not found." && exit 1)
if [ -f yarn.lock ] then yarn install --frozen-lockfile; \
elif [ -f package-lock.json ] then npm ci; \
elif [ -f pnpm-lock.yaml ] then yarn global add pnpm && pnpm i; \
else echo "Lockfile not found." && exit 1; \
fi


COPY src ./src
Expand Down
9 changes: 5 additions & 4 deletions examples/with-docker-multi-env/docker/development/Dockerfile
Expand Up @@ -8,10 +8,11 @@ WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN \
[ -f yarn.lock ] && yarn --frozen-lockfile --prod || \
[ -f package-lock.json ] && npm ci || \
[ -f pnpm-lock.yaml ] && yarn global add pnpm && pnpm fetch --prod && pnpm i -r --offline --prod || \
(echo "Lockfile not found." && exit 1)
if [ -f yarn.lock ] then yarn --frozen-lockfile;\
elif [ -f package-lock.json ] then npm ci;\
elif [ -f pnpm-lock.yaml ] then yarn global add pnpm && pnpm i;\
else echo "Lockfile not found." && exit 1;\
fi

# 2. Rebuild the source code only when needed
FROM node:16-alpine AS builder
Expand Down
9 changes: 5 additions & 4 deletions examples/with-docker-multi-env/docker/production/Dockerfile
Expand Up @@ -8,10 +8,11 @@ WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN \
[ -f yarn.lock ] && yarn --frozen-lockfile --prod || \
[ -f package-lock.json ] && npm ci || \
[ -f pnpm-lock.yaml ] && yarn global add pnpm && pnpm fetch --prod && pnpm i -r --offline --prod || \
(echo "Lockfile not found." && exit 1)
if [ -f yarn.lock ] then yarn --frozen-lockfile; \
elif [ -f package-lock.json ] then npm ci; \
elif [ -f pnpm-lock.yaml ] then yarn global add pnpm && pnpm i; \
else echo "Lockfile not found." && exit 1; \
fi


# 2. Rebuild the source code only when needed
Expand Down
9 changes: 5 additions & 4 deletions examples/with-docker-multi-env/docker/staging/Dockerfile
Expand Up @@ -8,10 +8,11 @@ WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN \
[ -f yarn.lock ] && yarn --frozen-lockfile --prod || \
[ -f package-lock.json ] && npm ci || \
[ -f pnpm-lock.yaml ] && yarn global add pnpm && pnpm fetch --prod && pnpm i -r --offline --prod || \
(echo "Lockfile not found." && exit 1)
if [ -f yarn.lock ] then yarn --frozen-lockfile; \
elif [ -f package-lock.json ] then npm ci; \
elif [ -f pnpm-lock.yaml ] then yarn global add pnpm && pnpm i; \
else echo "Lockfile not found." && exit 1; \
fi


# 2. Rebuild the source code only when needed
Expand Down
9 changes: 5 additions & 4 deletions examples/with-docker/Dockerfile
Expand Up @@ -7,10 +7,11 @@ WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN \
[ -f yarn.lock ] && yarn --frozen-lockfile --prod || \
[ -f package-lock.json ] && npm ci || \
[ -f pnpm-lock.yaml ] && yarn global add pnpm && pnpm fetch --prod && pnpm i -r --offline --prod || \
(echo "Lockfile not found." && exit 1)
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
elif [ -f package-lock.json ]; then npm ci; \
elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i; \
else echo "Lockfile not found." && exit 1; \
fi


# Rebuild the source code only when needed
Expand Down

0 comments on commit 0a781dd

Please sign in to comment.