Fix build (#37)

* change dockerfile

* change release

* fix skip build

* fix env values

* fix envs

* change envs

* checkout code in build part

* fix dockerfiles

Author: RICHARD-Quentin

app/Dockerfile

@@ -23,13 +23,6 @@ RUN apk update && apk --no-cache upgrade && apk add --no-cache \
   tcpdump
 
 COPY . .
-COPY ../package.json /tmp/root-package.json
-COPY ./package.json /tmp/app-package.json
-
-# Merge package.json files
-RUN jq -s '.[0] * .[1]' /tmp/root-package.json /tmp/app-package.json > /tmp/merged-package.json
-
-COPY /tmp/merged-package.json /usr/src/app/package.json
 
 RUN yarn workspace @libertech-fr/teaket_app install \
   --prefer-offline \

service/Dockerfile

@@ -3,16 +3,6 @@ FROM node:18.14.0-alpine AS builder
 WORKDIR /usr/src/app
 
 COPY . .
-COPY ../package.json /tmp/root-package.json
-COPY ./package.json /tmp/service-package.json
-
-# Install jq
-RUN apk update && apk --no-cache upgrade && apk add --no-cache jq
-
-# Merge package.json files
-RUN jq -s '.[0] * .[1]' /tmp/root-package.json /tmp/service-package.json > /tmp/merged-package.json
-
-COPY /tmp/merged-package.json /usr/src/app/package.json
 
 RUN apk add git && yarn workspace @libertech-fr/teaket_service install \
   --prefer-offline \
@@ -30,27 +20,22 @@ ENV NODE_ENV=${NODE_ENV}
 WORKDIR /usr/src/app
 
 # ADD Makefile .
-# ADD package.json .
+ADD package.json .
 ADD *.lock .
 
-COPY --from=builder /usr/src/app/package.json ./package.json
-
 RUN apk add --no-cache \
   openssl \
   git \
   jq \
   nano
 
-# Merge package.json files
-
-
 RUN yarn install \
   --prefer-offline \
   --pure-lockfile \
   --non-interactive \
   --production=true
 
-#COPY . .
+# COPY . .
 
 COPY --from=builder /usr/src/app/service/dist ./dist
 COPY ./service/views ./views