Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @MapColonies/vector-team
14 changes: 14 additions & 0 deletions .github/jira-integration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Jira Integration
on:
pull_request:
types: [opened, edited, synchronize]

permissions:
statuses: write
pull-requests: write

jobs:
jira-validation:
runs-on: ubuntu-latest
steps:
- uses: mapcolonies/javascript-github-actions/actions/jira-integration@jira-integration-v1
16 changes: 16 additions & 0 deletions .github/workflows/auto-author-assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: PR Author Auto Assign

on:
pull_request_target:
types: [opened, reopened]

permissions:
pull-requests: write

jobs:
assign-author:
runs-on: ubuntu-latest
steps:
- uses: toshimaru/auto-author-assign@v2.1.1
with:
repo-token: ${{ secrets.GH_PAT }}
6 changes: 3 additions & 3 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node: [20.x, 22.x]
node: [22.x, 24.x]
Comment thread
NivGreenstein marked this conversation as resolved.

steps:
- name: Check out TS Project Git repository
Expand Down Expand Up @@ -48,11 +48,11 @@ jobs:
tests:
name: Run Tests
runs-on: ubuntu-latest
container: node:20-bullseye
container: node:22-bullseye

strategy:
matrix:
node: [20.x, 22.x]
node: [22.x, 24.x]

services:
# Label used to access the service container
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20
v24
19 changes: 9 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
FROM node:20-bullseye as build
FROM node:24 AS build

WORKDIR /tmp/buildApp

# Install build dependencies for sharp (Debian uses apt-get)
RUN apt-get update && apt-get install -y python3 make g++ \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /tmp/buildApp

COPY ./package*.json ./
COPY .husky/ .husky/
RUN npm install

RUN npm install
COPY . .
RUN npm run build

FROM node:20-bullseye-slim as production
FROM node:24.10.0-alpine3.22 AS production

RUN apt-get update && apt-get install -y dumb-init \
&& rm -rf /var/lib/apt/lists/*
RUN apk add dumb-init

ENV NODE_ENV=production
ENV SERVER_PORT=8080


WORKDIR /usr/src/app

COPY --chown=node:node package*.json ./
COPY .husky/ .husky/

RUN npm ci --only=production

COPY --chown=node:node --from=build /tmp/buildApp/dist .
COPY --chown=node:node ./config ./config


USER node
EXPOSE ${SERVER_PORT}
EXPOSE 8080
CMD ["dumb-init", "node", "--import", "./instrumentation.mjs", "./index.js"]
3 changes: 2 additions & 1 deletion config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"cert": ""
},
"database": "postgres",
"noSupervisor": true
"supervisor": true,
"healthCheckTimeoutMs": 5000
}
},
"map": {
Expand Down
3 changes: 2 additions & 1 deletion config/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"enabled": false
},
"database": "postgres",
"noSupervisor": true
"supervisor": true,
"healthCheckTimeoutMs": 5000
}
},
"tilesStorage": {
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
NO_SUPERVISOR: {{ .jobQueue.pgBoss.noSupervisor | quote }}
APP_PROJECT_NAME: {{ .project.name }}
APP_PROJECT_STATE_URL: {{ .project.stateUrl }}
APP_FORCE_PROCESS: {{ .forceProcess }}
APP_FORCE_PROCESS: {{ .forceProcess | quote }}
DETILER_ENABLED: {{ .detiler.enabled | quote }}
{{- if .detiler.enabled }}
{{- if .detiler.proceedOnFailure }}
Expand Down
10 changes: 10 additions & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@ spec:
name: {{ printf "%s-configmap" (include "retiler.fullname" .) }}
- secretRef:
name: {{ printf "%s-secret" (include "retiler.fullname" .) }}
livenessProbe:
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
httpGet:
path: /liveness
port: http
readinessProbe:
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
httpGet:
path: /liveness
port: http
{{- if .Values.resources.enabled }}
resources:
{{- toYaml .Values.resources.value | nindent 12 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ env:
map:
provider: arcgis
url: https://some-domain.com/api/
format: png32
format: image/png
wms:
version: 1.3.0
layers: MAP_WMS_LAYERS
Expand Down
Loading
Loading