Merge remote-tracking branch 'lardee/build-process' into test

HSLdevcom · Dec 27, 2024 · 738fefb · 738fefb
2 parents 4a43f2b + e35e9ed
commit 738fefb
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 54 deletions.
diff --git a/finland/config.js b/finland/config.js
@@ -1,4 +1,4 @@
-const { mapSrc } = require('../task/Common')
+const { mapSrc } = require('../util')
 
 module.exports = {
   id: 'finland',

diff --git a/gulpfile.js b/gulpfile.js
@@ -17,7 +17,6 @@ const { buildOTPGraphTask } = require('./task/BuildOTPGraph')
 const { renameGTFSFile } = require('./task/GTFSRename')
 const { replaceGTFSFilesTask } = require('./task/GTFSReplace')
 const { extractFromZip, addToZip } = require('./task/ZipTask')
-const patchDeploymentFiles = require('./task/PatchDeploymentFiles')
 const storageCleanup = require('./task/StorageCleanup')
 
 const seedSourceDir = `${config.dataDir}/router-${config.router.id}` // e.g. data/router-hsl
@@ -182,6 +181,4 @@ gulp.task('router:store', () =>
   gulp.src(`${config.dataDir}/build/${config.router.id}/**/*`, { buffer: false }).pipe(gulp.dest(`${config.storageDir}/${global.storageDirName}/`))
 )
 
-gulp.task('deploy:prepare', () => patchDeploymentFiles())
-
 gulp.task('storage:cleanup', () => storageCleanup(config.storageDir, config.router.id, process.env.SEED_TAG))
diff --git a/hsl/config.js b/hsl/config.js
@@ -1,4 +1,4 @@
-const { mapSrc } = require('../task/Common')
+const { mapSrc } = require('../util')
 
 module.exports = {
   id: 'hsl',

diff --git a/kela/config.js b/kela/config.js
@@ -1,4 +1,4 @@
-const { mapSrc } = require('../task/Common')
+const { mapSrc } = require('../util')
 
 module.exports = {
   id: 'kela',

diff --git a/opentripplanner/Dockerfile b/opentripplanner/Dockerfile
@@ -4,8 +4,8 @@ FROM hsldevcom/opentripplanner:${OTP_TAG}
 ARG OTP_GRAPH_DIR
 ENV OTP_GRAPH_DIR=$OTP_GRAPH_DIR
 
-ADD entrypoint.sh /var/otp/entrypoint.sh
+ADD entrypoint.sh /var/entrypoint.sh
 
 WORKDIR /var/otp/${OTP_GRAPH_DIR}
 
-ENTRYPOINT ["/var/otp/entrypoint.sh"]
+ENTRYPOINT ["/var/entrypoint.sh"]
diff --git a/task/Common.js b/task/Common.js
diff --git a/task/PatchDeploymentFiles.js b/task/PatchDeploymentFiles.js
diff --git a/util.js b/util.js
@@ -144,6 +144,16 @@ function dirNameToDate (dirName) {
   return date instanceof Date && !isNaN(date) ? date : null
 }
 
+/*
+ * id = feedid (String)
+ * url = feed url (String)
+ * fit = mapfit shapes (true/falsy)
+ * rules = OBA Filter rules to apply (array of strings or undefined)
+ * replacements = replace or remove file from gtfs package (format: {'file_to_replace': 'file_to_replace_with' or null})
+ * request options = optional special options for request
+ */
+const mapSrc = (id, url, fit, rules, replacements, request) => ({ id, url, fit, rules, replacements, request })
+
 module.exports = {
   zipDir: (zipFile, dir, cb) => {
     zipWithGlob(zipFile, [`${dir}/*`], undefined, cb)
@@ -153,5 +163,6 @@ module.exports = {
   updateSlackMessage,
   otpMatching,
   parseId,
-  dirNameToDate
+  dirNameToDate,
+  mapSrc
 }
diff --git a/varely/config.js b/varely/config.js
@@ -1,4 +1,4 @@
-const { mapSrc } = require('../task/Common')
+const { mapSrc } = require('../util')
 
 module.exports = {
   id: 'varely',

diff --git a/waltti-alt/config.js b/waltti-alt/config.js
@@ -1,4 +1,4 @@
-const { mapSrc } = require('../task/Common')
+const { mapSrc } = require('../util')
 
 module.exports = {
   id: 'waltti-alt',

diff --git a/waltti/config.js b/waltti/config.js
@@ -1,4 +1,4 @@
-const { mapSrc } = require('../task/Common')
+const { mapSrc } = require('../util')
 
 module.exports = {
   id: 'waltti',