diff options
| -rwxr-xr-x | code/api/build_and_push.sh | 2 | ||||
| -rw-r--r-- | code/app/Dockerfile | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/code/api/build_and_push.sh b/code/api/build_and_push.sh index 8aaff38..163d7f3 100755 --- a/code/api/build_and_push.sh +++ b/code/api/build_and_push.sh @@ -7,7 +7,7 @@ CURRENT_DEV_VERSION_INT=${CURRENT_DEV_VERSION//[!0-9]/} CURRENT_VERSION=$(cat .version) CURRENT_VERSION_INT=${CURRENT_VERSION//[!0-9]/} if [ ${1-prod} == "dev" ]; then - NEW_VERSION="v$((CURRENT_DEV_VERSION_INT + 1))dev" + NEW_VERSION="v$((CURRENT_DEV_VERSION_INT + 1))-dev" OLD_VERSION=$CURRENT_DEV_VERSION else NEW_VERSION="v$((CURRENT_VERSION_INT + 1))" diff --git a/code/app/Dockerfile b/code/app/Dockerfile index a79f35e..6776dee 100644 --- a/code/app/Dockerfile +++ b/code/app/Dockerfile @@ -1,11 +1,10 @@ -# syntax=docker/dockerfile:1 -FROM node:18.12.0-alpine3.16 AS builder +FROM node:current-alpine3.15 AS builder WORKDIR . COPY package.json . RUN npm i COPY . . RUN npm run build -FROM node:18.12.0-alpine3.16 +FROM node:current-alpine3.15 USER node:node WORKDIR . COPY --from=builder --chown=node:node build build |