From ee2c5c35c87dce6554b28e03adb19b8261122d94 Mon Sep 17 00:00:00 2001
From: Fanch <fanch@libre.bzh>
Date: Thu, 11 Jan 2024 16:48:16 +0100
Subject: [PATCH 1/2] use full registry path for docker image

---
 .env.dist     | 2 +-
 .env.test     | 2 +-
 Dockerfile    | 8 ++++----
 ci/.env.ci    | 4 ++--
 ci/Dockerfile | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.env.dist b/.env.dist
index ccec3e0..2314822 100644
--- a/.env.dist
+++ b/.env.dist
@@ -17,5 +17,5 @@ REDIS_PASSWORD=redis
 REDIS_PORT=6379
 
 # OPA
-OPA_IMAGE=openpolicyagent/opa:0.58.0
+OPA_IMAGE=docker.io/openpolicyagent/opa:0.58.0
 OPA_URL=http://v3-auth-opa:8181/v1/data/
diff --git a/.env.test b/.env.test
index 05e99ba..4c40d92 100644
--- a/.env.test
+++ b/.env.test
@@ -10,5 +10,5 @@ MESSAGE_BROKER_URI=amqp://mobicoop:mobicoop@v3-broker:5672
 MESSAGE_BROKER_EXCHANGE=mobicoop
 
 # OPA
-OPA_IMAGE=openpolicyagent/opa:0.54.0
+OPA_IMAGE=docker.io/openpolicyagent/opa:0.54.0
 OPA_URL=http://v3-auth-opa:8181/v1/data/
diff --git a/Dockerfile b/Dockerfile
index db77849..7711d16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG NODE_VERSION=20.9.0
 # BUILD FOR LOCAL DEVELOPMENT
 ###################
 
-FROM node:${NODE_VERSION} As development
+FROM docker.io/node:${NODE_VERSION} As development
 
 # Create app directory
 WORKDIR /usr/src/app
@@ -31,7 +31,7 @@ USER node
 # BUILD FOR PRODUCTION
 ###################
 
-FROM node:${NODE_VERSION} As build
+FROM docker.io/node:${NODE_VERSION} As build
 
 WORKDIR /usr/src/app
 
@@ -68,7 +68,7 @@ USER node
 # PRODUCTION
 ###################
 
-FROM node:${NODE_VERSION} As production
+FROM docker.io/node:${NODE_VERSION} As production
 
 # Copy package.json to be able to execute migration command
 COPY --chown=node:node package*.json ./
@@ -80,4 +80,4 @@ COPY --chown=node:node --from=build /usr/src/app/opa ./opa
 COPY --chown=node:node --from=build /usr/src/app/dist ./dist
 
 # Start the server using the production build
-CMD [ "node", "dist/main.js" ]
+CMD [ "node", "--trace-warnings", "dist/main.js" ]
diff --git a/ci/.env.ci b/ci/.env.ci
index 8f8986e..fee4dc2 100644
--- a/ci/.env.ci
+++ b/ci/.env.ci
@@ -6,7 +6,7 @@ SERVICE_PORT=5002
 DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=public"
 
 # MESSAGE BROKER
-MESSAGE_BROKER_IMAGE=rabbitmq:3-alpine
+MESSAGE_BROKER_IMAGE=docker.io/rabbitmq:3-alpine
 
 # POSTGRES
-POSTGRES_IMAGE=postgres:15.0
+POSTGRES_IMAGE=docker.io/postgres:15.0
diff --git a/ci/Dockerfile b/ci/Dockerfile
index a442b31..6ced861 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -4,7 +4,7 @@ ARG NODE_VERSION=20.9.0
 # BUILD FOR CI TESTING
 ###################
 
-FROM node:${NODE_VERSION}
+FROM docker.io/node:${NODE_VERSION}
 
 # Create app directory
 WORKDIR /usr/src/app

From 6caa3d83cf94befe21a8c3de827d7e9181342886 Mon Sep 17 00:00:00 2001
From: Fanch <fanch@libre.bzh>
Date: Thu, 11 Jan 2024 16:56:20 +0100
Subject: [PATCH 2/2] remove node tracewarning as it should not have been added

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7711d16..7a89108 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -80,4 +80,4 @@ COPY --chown=node:node --from=build /usr/src/app/opa ./opa
 COPY --chown=node:node --from=build /usr/src/app/dist ./dist
 
 # Start the server using the production build
-CMD [ "node", "--trace-warnings", "dist/main.js" ]
+CMD [ "node", "dist/main.js" ]