Fix the node layers

index.ts

@@ -62,10 +62,7 @@ const s3Policy = new aws.iam.Policy('swift-build-s3-write-only', {
       {
         Effect: 'Allow',
         Action: ['s3:PutObject'],
-        Resource: [
-          'arn:aws:s3:::prod-infra-api-artifactsbucket70f686f6-ahndteqyzoel',
-          'arn:aws:s3:::dev-swift-cloud-api-stack-artifactsbucket70f686f6-jlbt8mnklu1n/*'
-        ]
+        Resource: ['arn:aws:s3:::prod-infra-api-artifactsbucket70f686f6-ahndteqyzoel']
       }
     ]
   }
@@ -85,10 +82,7 @@ const sqsPolicy = new aws.iam.Policy('swift-build-sqs-read-delete-send', {
       {
         Effect: 'Allow',
         Action: ['sqs:SendMessage'],
-        Resource: [
-          'arn:aws:sqs:us-east-1:172469817718:dev-infra-BuildQueue.fifo',
-          'arn:aws:sqs:us-east-1:172469817718:prod-infra-BuildQueue.fifo'
-        ]
+        Resource: ['arn:aws:sqs:us-east-1:172469817718:prod-infra-BuildQueue.fifo']
       }
     ]
   }

src/images/Dockerfile.rust-1_x

@@ -24,13 +24,12 @@ RUN set -e; \
 
 # Install Node.js
 RUN set -e; \
-    export DEBIAN_FRONTEND=noninteractive NODE_MAJOR=16 \
-    && apt-get update \
-    && apt-get install -y ca-certificates curl gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && apt-get update \
-    && apt-get install nodejs npm -y;
+    export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update && apt-get install -y ca-certificates curl gnupg; \
+    mkdir -p /etc/apt/keyrings; \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" > /etc/apt/sources.list.d/nodesource.list; \
+    apt-get update && apt-get install -y nodejs;
 
 # Install pnpm
 RUN set -e; \

src/images/Dockerfile.swiftwasm-5_6

@@ -19,13 +19,12 @@ RUN set -e; \
 
 # Install Node.js
 RUN set -e; \
-    export DEBIAN_FRONTEND=noninteractive NODE_MAJOR=16 \
-    && apt-get update \
-    && apt-get install -y ca-certificates curl gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && apt-get update \
-    && apt-get install nodejs npm -y;
+    export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update && apt-get install -y ca-certificates curl gnupg; \
+    mkdir -p /etc/apt/keyrings; \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" > /etc/apt/sources.list.d/nodesource.list; \
+    apt-get update && apt-get install -y nodejs;
 
 # Install pnpm
 RUN set -e; \

src/images/Dockerfile.swiftwasm-5_7

@@ -19,13 +19,12 @@ RUN set -e; \
 
 # Install Node.js
 RUN set -e; \
-    export DEBIAN_FRONTEND=noninteractive NODE_MAJOR=16 \
-    && apt-get update \
-    && apt-get install -y ca-certificates curl gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && apt-get update \
-    && apt-get install nodejs npm -y;
+    export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update && apt-get install -y ca-certificates curl gnupg; \
+    mkdir -p /etc/apt/keyrings; \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" > /etc/apt/sources.list.d/nodesource.list; \
+    apt-get update && apt-get install -y nodejs;
 
 # Install pnpm
 RUN set -e; \

src/images/Dockerfile.swiftwasm-5_8

@@ -19,13 +19,12 @@ RUN set -e; \
 
 # Install Node.js
 RUN set -e; \
-    export DEBIAN_FRONTEND=noninteractive NODE_MAJOR=16 \
-    && apt-get update \
-    && apt-get install -y ca-certificates curl gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && apt-get update \
-    && apt-get install nodejs npm -y;
+    export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update && apt-get install -y ca-certificates curl gnupg; \
+    mkdir -p /etc/apt/keyrings; \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" > /etc/apt/sources.list.d/nodesource.list; \
+    apt-get update && apt-get install -y nodejs;
 
 # Install pnpm
 RUN set -e; \

src/images/Dockerfile.swiftwasm-5_9

@@ -56,13 +56,12 @@ RUN set -e; \
 
 # Install Node.js
 RUN set -e; \
-    export DEBIAN_FRONTEND=noninteractive NODE_MAJOR=16 \
-    && apt-get update \
-    && apt-get install -y ca-certificates curl gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && apt-get update \
-    && apt-get install nodejs npm -y;
+    export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update && apt-get install -y ca-certificates curl gnupg; \
+    mkdir -p /etc/apt/keyrings; \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" > /etc/apt/sources.list.d/nodesource.list; \
+    apt-get update && apt-get install -y nodejs;
 
 # Install pnpm
 RUN set -e; \