Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/1.2.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
mtlmatt committed Jun 12, 2024
2 parents 30f79b8 + 76346b6 commit fd4c2fd
Show file tree
Hide file tree
Showing 19 changed files with 25,479 additions and 13,913 deletions.
2 changes: 1 addition & 1 deletion le-taxi-api-node.js/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.13-slim
FROM node:20.13-slim

RUN echo "America/Montreal" > /etc/timezone
RUN dpkg-reconfigure -f noninteractive tzdata
Expand Down
2 changes: 1 addition & 1 deletion le-taxi-api-node.js/Jenkinsfile-dataDumpAndUi
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ctx = pipeline.createContext([
],
build: [
branchOverrides: [
"feature/TM-1799-integration-transit": "develop",
"feature/TM-1805-bump-versions": "develop",
],
],
packaging: [
Expand Down
2 changes: 1 addition & 1 deletion le-taxi-api-node.js/Jenkinsfile-geoServer
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ctx = pipeline.createContext([
],
build: [
branchOverrides: [
"feature/TM-1799-integration-transit": "develop",
"feature/TM-1805-bump-versions": "develop",
],
],
packaging: [
Expand Down
2 changes: 1 addition & 1 deletion le-taxi-api-node.js/Jenkinsfile-operatorAndMotor
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ctx = pipeline.createContext([
],
build: [
branchOverrides: [
"feature/TM-1799-transit": "develop",
"feature/TM-1805-bump-versions": "develop",
],
],
packaging: [
Expand Down
Loading

0 comments on commit fd4c2fd

Please sign in to comment.