From 319cc7b7a7e6574362ef530f75c1e22402f354f3 Mon Sep 17 00:00:00 2001 From: Fanch Date: Fri, 12 Jan 2024 09:17:42 +0100 Subject: [PATCH 1/2] use full registry path for docker image --- Dockerfile | 6 +++--- ci/.env.ci | 9 +++------ ci/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59c44e3..64102ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # BUILD FOR LOCAL DEVELOPMENT ################### -FROM node:18-alpine3.16 As development +FROM docker.io/node:18-alpine3.16 As development # Create app directory WORKDIR /usr/src/app @@ -29,7 +29,7 @@ USER node # BUILD FOR PRODUCTION ################### -FROM node:18-alpine3.16 As build +FROM docker.io/node:18-alpine3.16 As build WORKDIR /usr/src/app @@ -63,7 +63,7 @@ USER node # PRODUCTION ################### -FROM node:18-alpine3.16 As production +FROM docker.io/node:18-alpine3.16 As production # Copy package.json to be able to execute migration command COPY --chown=node:node package*.json ./ diff --git a/ci/.env.ci b/ci/.env.ci index c5f1b70..c158c59 100644 --- a/ci/.env.ci +++ b/ci/.env.ci @@ -15,9 +15,9 @@ REDIS_PASSWORD=redis REDIS_PORT=6379 # IMAGES -BROKER_IMAGE=rabbitmq:3-alpine -REDIS_IMAGE=redis:7.0-alpine -POSTGRES_IMAGE=postgis/postgis:15-3.3 +BROKER_IMAGE=docker.io/rabbitmq:3-alpine +REDIS_IMAGE=docker.io/redis:7.0-alpine +POSTGRES_IMAGE=docker.io/postgis/postgis:15-3.3 # DEFAULT CONFIGURATION @@ -54,6 +54,3 @@ MAX_DETOUR_DURATION_RATIO=0.3 GEOROUTER_TYPE=graphhopper # georouter url GEOROUTER_URL=http://localhost:8989 - - - diff --git a/ci/Dockerfile b/ci/Dockerfile index 26b388a..b517a3f 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -2,7 +2,7 @@ # BUILD FOR CI TESTING ################### -FROM node:18-alpine3.16 +FROM docker.io/node:18-alpine3.16 # Create app directory WORKDIR /usr/src/app From 6fa8594fa66c656df461fdae723a6899ae997f77 Mon Sep 17 00:00:00 2001 From: Fanch Date: Mon, 22 Jan 2024 16:57:44 +0100 Subject: [PATCH 2/2] use node lts image for docker --- Dockerfile | 6 +++--- ci/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64102ae..87314cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # BUILD FOR LOCAL DEVELOPMENT ################### -FROM docker.io/node:18-alpine3.16 As development +FROM docker.io/node:lts-hydrogen As development # Create app directory WORKDIR /usr/src/app @@ -29,7 +29,7 @@ USER node # BUILD FOR PRODUCTION ################### -FROM docker.io/node:18-alpine3.16 As build +FROM docker.io/node:lts-hydrogen As build WORKDIR /usr/src/app @@ -63,7 +63,7 @@ USER node # PRODUCTION ################### -FROM docker.io/node:18-alpine3.16 As production +FROM docker.io/node:lts-hydrogen As production # Copy package.json to be able to execute migration command COPY --chown=node:node package*.json ./ diff --git a/ci/Dockerfile b/ci/Dockerfile index b517a3f..6770fcb 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -2,7 +2,7 @@ # BUILD FOR CI TESTING ################### -FROM docker.io/node:18-alpine3.16 +FROM docker.io/node:lts-hydrogen # Create app directory WORKDIR /usr/src/app