Skip to content

Commit 50e0bba

Browse files
committed
Get make.sh targets running on Node.js v18
1 parent a927c5c commit 50e0bba

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NODE_JS_VERSION=16
1+
ARG NODE_JS_VERSION=18
22
FROM node:${NODE_JS_VERSION}
33

44
# Create app directory

.ci/make.sh

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ TASK=$1
3434
TASK_ARGS=()
3535
VERSION=$2
3636
STACK_VERSION=$VERSION
37-
NODE_JS_VERSION=16
38-
WORKFLOW=${WORKFLOW-staging}
3937
set -euo pipefail
4038

4139
product="elastic/elasticsearch-js"
4240
output_folder=".ci/output"
4341
OUTPUT_DIR="$repo/${output_folder}"
44-
REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
42+
# REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
43+
NODE_JS_VERSION=18
44+
WORKFLOW=${WORKFLOW-staging}
4545
mkdir -p "$OUTPUT_DIR"
4646

4747
echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
@@ -118,10 +118,8 @@ echo -e "\033[34;1mINFO: building $product container\033[0m"
118118

119119
docker build \
120120
--file .ci/Dockerfile \
121-
--tag ${product} \
122-
--build-arg NODE_JS_VERSION=${NODE_JS_VERSION} \
123-
--build-arg USER_ID="$(id -u)" \
124-
--build-arg GROUP_ID="$(id -g)" \
121+
--tag "$product" \
122+
--build-arg NODE_JS_VERSION="$NODE_JS_VERSION" \
125123
.
126124

127125
# ------------------------------------------------------- #
@@ -131,14 +129,15 @@ docker build \
131129
echo -e "\033[34;1mINFO: running $product container\033[0m"
132130

133131
docker run \
134-
--volume $repo:/usr/src/app \
135-
--volume $generator:/usr/src/elastic-client-generator-js \
132+
--volume "$repo:/usr/src/app" \
133+
--volume "$generator:/usr/src/elastic-client-generator-js" \
136134
--volume /usr/src/app/node_modules \
137-
--env "WORKFLOW=${WORKFLOW}" \
135+
-u "$(id -u):$(id -g)" \
136+
--env "WORKFLOW=$WORKFLOW" \
138137
--name make-elasticsearch-js \
139138
--rm \
140139
$product \
141-
node .ci/make.mjs --task $TASK ${TASK_ARGS[*]}
140+
node .ci/make.mjs --task $TASK "${TASK_ARGS[@]}"
142141

143142
# ------------------------------------------------------- #
144143
# Post Command tasks & checks

0 commit comments

Comments
 (0)