change default node for newer sdk

mcfedr · mcfedr · commit 9fdce871c793 · 2023-05-26T11:47:20.000+01:00
diff --git a/30,/Dockerfile b/30,/Dockerfile
diff --git a/30,/tools/adb-all b/30,/tools/adb-all
diff --git a/30,/tools/license_accepter b/30,/tools/license_accepter
diff --git a/32-emulator/Dockerfile b/32-emulator/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/32-ndk/Dockerfile b/32-ndk/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/32-stf-client/Dockerfile b/32-stf-client/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/32/Dockerfile b/32/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/33-emulator/Dockerfile b/33-emulator/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/33-ndk/Dockerfile b/33-ndk/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/33-stf-client/Dockerfile b/33-stf-client/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/33/Dockerfile b/33/Dockerfile
@@ -32,8 +32,8 @@ RUN apt-get update \
   # For nodejs we use nodesource, its nice and easy and gets us the correct version
   # Find latest link https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
   && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src https://deb.nodesource.com/node_18.x $(lsb_release -s -c) main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     nodejs \
diff --git a/update.sh b/update.sh
@@ -3,31 +3,39 @@ set -e
 
 variants=('30' '31' '32' '33')
 
-node_variants=('14')
-default_node_variant='14'
+## Disabled creating extra node variants, rather just having a default for each SDK
+#node_variants=('14' '18')
+declare  -A default_node_variants=(
+  ['30']='14'
+  ['31']='14'
+  ['32']='18'
+  ['33']='18'
+)
 
 jdk_variants=('11')
 default_jdk_variant='11'
 
-declare -A buildTools=(
+declare -A build_tools=(
   ['30']='30.0.3'
   ['31']='31.0.0'
   ['32']='32.0.0'
   ['33']='33.0.0'
 )
 
-declare -A extraPackages=(
+declare -A extra_packages=(
   ['30']='"build-tools;30.0.0 build-tools;30.0.1 build-tools;30.0.2"'
   ['31']='"build-tools;31.0.0"'
   ['32']='"build-tools;32.0.0"'
   ['33']='"build-tools;33.0.0 build-tools;33.0.1 build-tools;33.0.2"'
 )
 
 for variant in "${variants[@]}"; do
-  for node_variant in "${node_variants[@]}"; do
+#  for node_variant in "${node_variants[@]}"; do
     for jdk_variant in "${jdk_variants[@]}"; do
       for type in 'default' 'emulator' 'ndk' 'stf-client'; do
         template="Dockerfile.template"
+        default_node_variant="${default_node_variants[$variant]}"
+        node_variant="$default_node_variant"
         if [ "$type" != "default" ]; then
           dir="$variant-$type"
           if [ "$node_variant" != "$default_node_variant" ]; then
@@ -57,36 +65,36 @@ for variant in "${variants[@]}"; do
         mkdir -p "$dir"
         cp -r tools/ "$dir/tools/"
 
-        extraSed=''
+        extra_sed=''
         if [ "$type" = "emulator" ]; then
           cp -r tools-emulator/ "$dir/tools-emulator/"
         else
-          extraSed='
-            '"$extraSed"'
+          extra_sed='
+            '"$extra_sed"'
             /##<emulator>##/,/##<\/emulator>##/d;
           '
         fi
         if [ "$type" != "ndk" ]; then
-          extraSed='
-            '"$extraSed"'
+          extra_sed='
+            '"$extra_sed"'
             /##<ndk>##/,/##<\/ndk>##/d;
           '
         fi
         if [ "$type" != "stf-client" ]; then
-          extraSed='
-            '"$extraSed"'
+          extra_sed='
+            '"$extra_sed"'
             /##<stf-client>##/,/##<\/stf-client>##/d;
           '
         fi
         sed -E '
-          '"$extraSed"'
+          '"$extra_sed"'
           s/%%VARIANT%%/'"$variant"'/;
           s/%%NODE_VARIANT%%/'"$node_variant"'/;
-          s/%%BUILD_TOOLS%%/'"${buildTools[$variant]}"'/;
-          s/%%EXTRA_PACKAGES%%/'"${extraPackages[$variant]}"'/;
+          s/%%BUILD_TOOLS%%/'"${build_tools[$variant]}"'/;
+          s/%%EXTRA_PACKAGES%%/'"${extra_packages[$variant]}"'/;
           s/%%JDK_VERSION%%/'"$jdk_variant"'/;
         ' $template >"$dir/Dockerfile"
       done
     done
-  done
+#  done
 done
