Skip to content
Snippets Groups Projects
Unverified Commit 9fb9bb63 authored by BITARD Michaël's avatar BITARD Michaël Committed by GitHub
Browse files

chore(infra): met à jour node, nginx, oauth2-proxy... (#1325)

parent 0717fad8
Branches
Tags
No related merge requests found
...@@ -20,7 +20,7 @@ jobs: ...@@ -20,7 +20,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
...@@ -34,7 +34,7 @@ jobs: ...@@ -34,7 +34,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
...@@ -48,7 +48,7 @@ jobs: ...@@ -48,7 +48,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
...@@ -83,7 +83,7 @@ jobs: ...@@ -83,7 +83,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Npm install - name: Npm install
run: make install run: make install
...@@ -123,31 +123,31 @@ jobs: ...@@ -123,31 +123,31 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Npm install - name: Npm install
run: make install run: make install
- uses: cardinalby/export-env-action@v2 - uses: cardinalby/export-env-action@v2
with: with:
envFile: '.env-example' envFile: '.env-example'
expand: 'true' expand: 'true'
- name: Migrate database and check queries - name: Migrate database and check queries
run: | run: |
make db/migrate make db/migrate
make db/check-queries make db/check-queries
if [ ! -z "$(git status --porcelain)" ]; then if [ ! -z "$(git status --porcelain)" ]; then
echo "Lancer 'make db/check-queries' sur sa machine et commiter les changements" echo "Lancer 'make db/check-queries' sur sa machine et commiter les changements"
echo "BEGIN Git diff" echo "BEGIN Git diff"
git diff git diff
echo "END Git diff" echo "END Git diff"
exit 1; exit 1;
fi fi
env: env:
PGHOST: localhost PGHOST: localhost
PGPORT: 5432 PGPORT: 5432
PGUSER: postgres PGUSER: postgres
PGPASSWORD: password PGPASSWORD: password
PGDATABASE: camino PGDATABASE: camino
build: build:
needs: [unit-test, integration-test, lint, type, check-queries] needs: [unit-test, integration-test, lint, type, check-queries]
runs-on: ubuntu-latest runs-on: ubuntu-latest
......
...@@ -16,7 +16,7 @@ jobs: ...@@ -16,7 +16,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
......
...@@ -14,7 +14,7 @@ jobs: ...@@ -14,7 +14,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
...@@ -28,7 +28,7 @@ jobs: ...@@ -28,7 +28,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
...@@ -46,7 +46,7 @@ jobs: ...@@ -46,7 +46,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Npm install - name: Npm install
run: make install run: make install
......
...@@ -16,7 +16,7 @@ jobs: ...@@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
......
...@@ -12,8 +12,7 @@ jobs: ...@@ -12,8 +12,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Graphql inspector - name: Graphql inspector
run : make graphql/check run : make graphql/check
...@@ -20,7 +20,7 @@ jobs: ...@@ -20,7 +20,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install - name: Install
run: make install run: make install
...@@ -35,7 +35,7 @@ jobs: ...@@ -35,7 +35,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Test units - name: Test units
run: | run: |
...@@ -51,7 +51,7 @@ jobs: ...@@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: '20.12.2' node-version: '20.15.1'
cache: 'npm' cache: 'npm'
- name: Install dependencies - name: Install dependencies
run: make install run: make install
......
FROM node:20.12.2-alpine FROM node:20.15.1-alpine
WORKDIR / WORKDIR /
# on profite que # on profite que
......
FROM node:20.12.2-alpine as builder FROM node:20.15.1-alpine as builder
RUN apk add -U make python3 py3-pip curl RUN apk add -U make python3 py3-pip curl
RUN python3 -m pip config set global.break-system-packages true RUN python3 -m pip config set global.break-system-packages true
...@@ -7,7 +7,7 @@ WORKDIR /project ...@@ -7,7 +7,7 @@ WORKDIR /project
RUN make install RUN make install
RUN make docs/build RUN make docs/build
FROM nginx:1.26.0 FROM nginx:1.27.0
ADD storybook_nginx.conf /etc/nginx/templates/default.conf.template ADD storybook_nginx.conf /etc/nginx/templates/default.conf.template
COPY --from=builder /project/docs /usr/share/nginx/html COPY --from=builder /project/docs /usr/share/nginx/html
COPY --from=builder /project/packages/ui/storybook-static /usr/share/nginx/html/storybook COPY --from=builder /project/packages/ui/storybook-static /usr/share/nginx/html/storybook
#https://github.com/fabriziocucci/vuejs.org/blob/7f9aa12833c085b97a826df3ba240f7d9e069e1b/src/v2/cookbook/dockerize-vuejs-app.md #https://github.com/fabriziocucci/vuejs.org/blob/7f9aa12833c085b97a826df3ba240f7d9e069e1b/src/v2/cookbook/dockerize-vuejs-app.md
FROM node:20.12.2-alpine as build-stage FROM node:20.15.1-alpine as build-stage
LABEL maintainer=francois.romain@beta.gouv.fr LABEL maintainer=francois.romain@beta.gouv.fr
ARG GIT_SHA ARG GIT_SHA
ENV GIT_SHA=${GIT_SHA} ENV GIT_SHA=${GIT_SHA}
...@@ -15,7 +15,7 @@ RUN CI=true make install ...@@ -15,7 +15,7 @@ RUN CI=true make install
COPY ./ /app/ COPY ./ /app/
RUN make build/ui RUN make build/ui
FROM nginx:1.26.0 FROM nginx:1.27.0
COPY ui_nginx.conf /etc/nginx/templates/default.conf.template COPY ui_nginx.conf /etc/nginx/templates/default.conf.template
COPY ui_nginx_headers.conf /etc/nginx/templates/headers.conf.template COPY ui_nginx_headers.conf /etc/nginx/templates/headers.conf.template
COPY --from=build-stage /app/packages/ui/dist /usr/share/nginx/html COPY --from=build-stage /app/packages/ui/dist /usr/share/nginx/html
...@@ -74,7 +74,7 @@ services: ...@@ -74,7 +74,7 @@ services:
restart: unless-stopped restart: unless-stopped
oauth2: oauth2:
container_name: camino_oauth2 container_name: camino_oauth2
image: quay.io/oauth2-proxy/oauth2-proxy:v7.5.1 image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
depends_on: depends_on:
- ui - ui
- keycloak - keycloak
...@@ -112,7 +112,7 @@ services: ...@@ -112,7 +112,7 @@ services:
- nginx-proxy - nginx-proxy
keycloak: keycloak:
container_name: camino_keycloak container_name: camino_keycloak
image: quay.io/keycloak/keycloak:24.0.4 image: quay.io/keycloak/keycloak:24.0.5
depends_on: depends_on:
- db - db
environment: environment:
......
...@@ -3,7 +3,7 @@ version: '3' ...@@ -3,7 +3,7 @@ version: '3'
services: services:
nginx-proxy: nginx-proxy:
image: nginxproxy/nginx-proxy:1.5.1 image: nginxproxy/nginx-proxy:1.6.0
container_name: nginx-proxy container_name: nginx-proxy
restart: unless-stopped restart: unless-stopped
logging: logging:
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:ro
nginx-proxy-acme: nginx-proxy-acme:
image: nginxproxy/acme-companion:2.2.10 image: nginxproxy/acme-companion:2.4.0
container_name: nginx-proxy-acme container_name: nginx-proxy-acme
restart: unless-stopped restart: unless-stopped
volumes_from: volumes_from:
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
"vue": "3.4.26" "vue": "3.4.26"
}, },
"engines": { "engines": {
"node": ">=20.12.2", "node": ">=20.15.1",
"npm": ">=10.2.4" "npm": ">=10.7.0"
} }
}, },
"node_modules/@adobe/css-tools": { "node_modules/@adobe/css-tools": {
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name": "camino", "name": "camino",
"version": "1.0.0", "version": "1.0.0",
"engines": { "engines": {
"node": ">=20.12.2", "node": ">=20.15.1",
"npm": ">=10.2.4" "npm": ">=10.7.0"
}, },
"description": "Le cadastre minier numérique ouvert", "description": "Le cadastre minier numérique ouvert",
"workspaces": ["packages/api", "packages/common", "packages/ui"], "workspaces": ["packages/api", "packages/common", "packages/ui"],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment