ncaron
/
ad
mirror of https://gitlab.com/mobicoop/v3/service/ad.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_test_install' into 'main' 

Fix test install

See merge request v3/service/ad!34
This commit is contained in:
Fanch 2024-01-24 14:15:51 +00:00
parent 61c1d6ffcb 483e947d92
commit 41073539bf
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -2,7 +2,7 @@
# BUILD FOR LOCAL DEVELOPMENT # BUILD FOR LOCAL DEVELOPMENT
################### ###################
FROM node:18-alpine3.16 As development FROM docker.io/node:lts-hydrogen As development
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -29,7 +29,7 @@ USER node
# BUILD FOR PRODUCTION # BUILD FOR PRODUCTION
################### ###################
FROM node:18-alpine3.16 As build FROM docker.io/node:lts-hydrogen As build
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -63,7 +63,7 @@ USER node
# PRODUCTION # PRODUCTION
################### ###################
FROM 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 package.json to be able to execute migration command
COPY --chown=node:node package*.json ./ COPY --chown=node:node package*.json ./

5
ci/.env.ci
View File

@ -9,8 +9,7 @@ DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=public"
RMQ_URI=amqp://v3-ad-broker:5672 RMQ_URI=amqp://v3-ad-broker:5672
# MESSAGE BROKER # MESSAGE BROKER
BROKER_IMAGE=rabbitmq:3-alpine BROKER_IMAGE=docker.io/rabbitmq:3-alpine
# POSTGRES # POSTGRES
POSTGRES_IMAGE=postgres:15.0 POSTGRES_IMAGE=docker.io/postgres:15.0

2
ci/Dockerfile
View File

@ -2,7 +2,7 @@
# BUILD FOR CI TESTING # BUILD FOR CI TESTING
################### ###################
FROM node:18-alpine3.16 FROM docker.io/node:lts-hydrogen
# Create app directory # Create app directory
WORKDIR /usr/src/app WORKDIR /usr/src/app