Since there no longer is a canonical "classic" version, be explicit

fly-apps · Nov 21, 2023 · b05b04b · b05b04b
1 parent 2aef330
commit b05b04b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/templates/Dockerfile.ejs b/templates/Dockerfile.ejs
@@ -31,7 +31,7 @@ WORKDIR /app
 
 # Set production environment
 <%- emitEnv(baseEnv) %>
-<% if (yarn && yarnVersion != yarnClassic) { -%>
+<% if (yarn) { -%>
 ARG YARN_VERSION=<%= yarnVersion %>
 <% if(yarnVersion.startsWith('3.')) {-%>
 

diff --git a/test/base/cache-yarn/Dockerfile b/test/base/cache-yarn/Dockerfile
@@ -11,6 +11,8 @@ WORKDIR /app
 
 # Set production environment
 ENV NODE_ENV="production"
+ARG YARN_VERSION=xxx
+RUN npm install -g yarn@$YARN_VERSION --force
 
 
 # Throw-away build stage to reduce size of final image

diff --git a/test/frameworks/next-yarn/Dockerfile b/test/frameworks/next-yarn/Dockerfile
@@ -11,6 +11,8 @@ WORKDIR /app
 
 # Set production environment
 ENV NODE_ENV="production"
+ARG YARN_VERSION=xxx
+RUN npm install -g yarn@$YARN_VERSION --force
 
 
 # Throw-away build stage to reduce size of final image

diff --git a/test/frameworks/nuxt/Dockerfile b/test/frameworks/nuxt/Dockerfile
@@ -11,6 +11,8 @@ WORKDIR /app
 
 # Set production environment
 ENV NODE_ENV="production"
+ARG YARN_VERSION=xxx
+RUN npm install -g yarn@$YARN_VERSION --force
 
 
 # Throw-away build stage to reduce size of final image

diff --git a/test/frameworks/vite/Dockerfile b/test/frameworks/vite/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Adjust NODE_VERSION as desired
-ARG NODE_VERSION=21.2.0
+ARG NODE_VERSION=xxx
 FROM node:${NODE_VERSION}-slim as base
 
 LABEL fly_launch_runtime="Vite"