Browse Source

update nuxt projects to use yarn 4.1.1

Olivier Massot 1 year ago
parent
commit
3b14ae69bd
4 changed files with 8 additions and 21 deletions
  1. 2 5
      docker/agenda/Dockerfile
  2. 2 5
      docker/app/Dockerfile
  3. 2 5
      docker/nuxt_common/Dockerfile
  4. 2 6
      docker/portail_v2/Dockerfile

+ 2 - 5
docker/agenda/Dockerfile

@@ -2,11 +2,8 @@ FROM node:18.19-buster
 
 ENV WORKDIR /home/workspace
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-
-RUN apt-get update && apt-get install -y g++ build-essential yarn
+RUN corepack enable; \
+    yarn set version berry;
 
 # Cypress requirements (https://docs.cypress.io/guides/getting-started/installing-cypress#Ubuntu-Debian)
 RUN apt-get update && apt-get install -y --fix-missing libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 \

+ 2 - 5
docker/app/Dockerfile

@@ -3,11 +3,8 @@ FROM node:18.19-buster
 
 ENV WORKDIR /home/workspace
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-
-RUN apt-get update && apt-get install -y g++ build-essential yarn
+RUN corepack enable; \
+    yarn set version berry;
 
 # Define working directory.
 WORKDIR ${WORKDIR}

+ 2 - 5
docker/nuxt_common/Dockerfile

@@ -2,11 +2,8 @@ FROM node:18.10-buster
 
 ENV WORKDIR /home/workspace
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-
-RUN apt-get update && apt-get install -y g++ build-essential yarn
+RUN corepack enable; \
+    yarn set version berry;
 
 # Cypress requirements (https://docs.cypress.io/guides/getting-started/installing-cypress#Ubuntu-Debian)
 RUN apt-get update && apt-get install -y --fix-missing libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 \

+ 2 - 6
docker/portail_v2/Dockerfile

@@ -1,13 +1,9 @@
-    # Pull base image.
 FROM node:18.19-buster
 
 ENV WORKDIR /home/workspace
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-
-RUN apt-get update && apt-get install -y g++ build-essential yarn
+RUN corepack enable; \
+    yarn set version berry;
 
 # Define working directory.
 WORKDIR ${WORKDIR}