fix(export): add missing cdtn-elasticsearch to Dockerfile (#1038)

* fix(export): add missing cdtn-elasticsearch to Dockerfile

* fix(export): add missing cdtn-elasticsearch to Dockerfile

.husky/pre-commit

@@ -1,9 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lerna run \
-  --exclude-dependents \
-  --parallel 1 \
-  --since HEAD \
-  --stream \
-  ;
+yarn precommit;

.kontinuous/values.yaml

@@ -15,28 +15,16 @@ jobs:
       with:
         imagePackage: ingester
         dockerfile: targets/ingester/Dockerfile
-        secrets:
-          npmTiptapToken:
-            secretName: npm-tiptap
-            secretKey: NPM_TIPTAP_TOKEN
     build-alert:
       use: build
       with:
         imagePackage: alert
         dockerfile: targets/alert-cli/Dockerfile
-        secrets:
-          npmTiptapToken:
-            secretName: npm-tiptap
-            secretKey: NPM_TIPTAP_TOKEN
     build-export:
       use: build
       with:
         imagePackage: export
         dockerfile: targets/export-elasticsearch/Dockerfile
-        secrets:
-          npmTiptapToken:
-            secretName: npm-tiptap
-            secretKey: NPM_TIPTAP_TOKEN
     build-contributions:
       use: build
       with:

README-dev.md

@@ -70,7 +70,7 @@ $ yarn build
 It's easy to setup a new environment with docker compose :
 
 ```sh
-docker-compose up
+docker compose up
 ```
 
 The docker compose performs several steps.
@@ -82,7 +82,7 @@ A postgreSQL database is used to store the data exposed through a Hasura instanc
 > Start only the postgreSQL instance:
 >
 > ```sh
-> docker-compose up postgres
+> docker compose up postgres
 > ```
 
 ### Configure a Hasura instance
@@ -105,7 +105,7 @@ key).
 > Start only the Hasura instance (it starts the postgreSQL as dependency):
 >
 > ```sh
-> docker-compose up hasura
+> docker compose up hasura
 > ```
 
 ### Inject documents
@@ -138,7 +138,7 @@ Frontend is reachable at the address <http://localhost:3000>
 > Run the frontend (it starts Hasura as dependency):
 >
 > ```sh
-> docker-compose up www
+> docker compose up www
 > ```
 >
 > or via npm
@@ -192,15 +192,15 @@ récupérer les données de production dans un environnement de dev. Actuellemen
 backup de la base de données à l'équipe SRE et d'exécuter les commandes suivantes :
 
 ```sh
-docker-compose exec -T postgres pg_restore \
+docker compose exec -T postgres pg_restore \
   --dbname postgres --clean --if-exists --user postgres \
   --no-owner --no-acl --verbose  < ~/Downloads/hasura_prod_db.psql
 ```
 
 et pour remettre les utilisateurs par défaut
 
 ```sh
-docker-compose exec -T postgres psql \
+docker compose exec -T postgres psql \
   --dbname postgres --user postgres \
   < .kontinuous/sql/post-restore.sql
 ```

docker-compose.yml

@@ -54,8 +54,6 @@ services:
       context: .
       dockerfile: targets/contributions/Dockerfile
       shm_size: 512m
-      secrets:
-        - npmTiptapToken
     depends_on:
       - hasura
       - www
@@ -71,8 +69,6 @@ services:
       context: .
       dockerfile: targets/ingester/Dockerfile
       shm_size: 512m
-      secrets:
-        - npmTiptapToken
     depends_on:
       - hasura
     env_file:
@@ -106,12 +102,11 @@ services:
       - elasticsearch
 
   export:
+    platform: linux/amd64
     build:
       context: .
       dockerfile: targets/export-elasticsearch/Dockerfile
       shm_size: 512m
-      secrets:
-        - npmTiptapToken
     ports:
       - 8787:8787
     environment:
@@ -128,8 +123,6 @@ services:
     build:
       context: .
       dockerfile: targets/alert-cli/Dockerfile
-      secrets:
-        - npmTiptapToken
 
 volumes:
   db_data:

package.json

@@ -15,7 +15,8 @@
     "test": "nps test",
     "k8s": "yarn --silent --cwd .k8s",
     "prepare": "test -n \"$CI\" || husky install",
-    "clean": "lerna clean"
+    "clean": "lerna clean",
+    "precommit": "lerna run --exclude-dependents --parallel 1 --since HEAD --stream"
   },
   "workspaces": [
     "shared/*",

targets/alert-cli/Dockerfile

@@ -8,9 +8,7 @@ COPY yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmTiptapToken,target=/secrets/npmTiptapToken \
-  export NPM_TIPTAP_TOKEN=$(cat /secrets/npmTiptapToken); \
-  yarn fetch workspaces focus alert-cli
+RUN yarn fetch workspaces focus alert-cli
 
 FROM deps AS build-graphql-client
 COPY shared/graphql-client ./shared/graphql-client

targets/contributions/Dockerfile

@@ -8,9 +8,7 @@ COPY yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmTiptapToken,target=/secrets/npmTiptapToken \
-  export NPM_TIPTAP_TOKEN=$(cat /secrets/npmTiptapToken); \
-  yarn fetch workspaces focus @socialgouv/contibutions
+RUN yarn fetch workspaces focus @socialgouv/contibutions
 
 FROM deps AS build-graphql-client
 COPY shared/graphql-client ./shared/graphql-client

targets/export-elasticsearch/Dockerfile

@@ -10,9 +10,7 @@ COPY yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmTiptapToken,target=/secrets/npmTiptapToken \
-  export NPM_TIPTAP_TOKEN=$(cat /secrets/npmTiptapToken); \
-  yarn fetch workspaces focus export-elasticsearch
+RUN yarn fetch workspaces focus export-elasticsearch
 
 FROM deps AS build-graphql-client
 COPY shared/graphql-client ./shared/graphql-client
@@ -29,6 +27,7 @@ RUN yarn workspace @socialgouv/cdtn-logger build
 FROM deps AS build-elasticsearch-document-adapter
 COPY --from=build-types /app/shared/types ./shared/types
 COPY --from=build-cdtn-logger /app/shared/logger ./shared/logger
+COPY shared/elasticsearch ./shared/elasticsearch
 COPY shared/elasticsearch-document-adapter ./shared/elasticsearch-document-adapter
 RUN yarn workspace @shared/elasticsearch-document-adapter build
 

targets/ingester/Dockerfile

@@ -10,9 +10,7 @@ COPY yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 
 # hadolint ignore=SC2046
-RUN --mount=type=secret,id=npmTiptapToken,target=/secrets/npmTiptapToken \
-  export NPM_TIPTAP_TOKEN=$(cat /secrets/npmTiptapToken); \
-  yarn fetch workspaces focus ingester
+RUN yarn fetch workspaces focus ingester
 
 FROM deps AS build-graphql-client
 COPY shared/graphql-client ./shared/graphql-client