Merge branch 'dev' into 'main'

Merged docker files

See merge request illegitimate/illegitimate-bot!290

.gitlab-ci.yml

@@ -6,9 +6,7 @@ merge:
   variables:
     DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   script:
-    - |
+    - docker build -t "$DOCKER_IMAGE_NAME" .
-        docker build . -f Dockerfile.cache -t node-cache
-        docker build -t "$DOCKER_IMAGE_NAME" .
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 
@@ -23,7 +21,6 @@ build:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-        docker build . -f Dockerfile.cache -t node-cache
         docker build -t "$DOCKER_IMAGE_NAME" .
         docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:main"
         docker push "$CI_REGISTRY_IMAGE:main"

Dockerfile

@@ -1,9 +1,20 @@
-FROM node-cache AS cache
+FROM node:21.7.3-alpine3.18 AS cache
+
+WORKDIR /cache
+
+COPY .yarnrc.yml .
+COPY package.json .
+COPY yarn.lock .
+
+RUN corepack enable
+RUN yarn install
+
+# main image
 FROM node:21.7.3-alpine3.18
 
-COPY --from=cache /cache/node_modules /app/node_modules
-COPY . /app
 WORKDIR /app
+COPY --from=cache /cache/node_modules /app/node_modules
+COPY . .
 
 RUN apk add --no-cache ffmpeg
 RUN corepack enable

Dockerfile.cache

@@ -1,12 +0,0 @@
-FROM node:21.7.3-alpine3.18
-
-RUN mkdir /cache
-
-COPY .yarnrc.yml /cache
-COPY package.json /cache
-COPY yarn.lock /cache
-
-WORKDIR /cache
-
-RUN corepack enable
-RUN yarn install