diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index 3fcfb509f6..db3c98a793 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -22,7 +22,7 @@ RUN git clone https://github.com/overleaf/overleaf.git \ # Install dependencies needed to run configuration scripts # -------------------------------------------------------- ADD ${baseDir}/package.json /var/www/package.json -ADD ${baseDir}/git-revision.js /var/www/git-revision.js +ADD ${baseDir}/git-revision.sh /var/www/git-revision.sh RUN cd /var/www && npm install @@ -78,7 +78,7 @@ COPY ${baseDir}/init_scripts/ /etc/my_init.d/ # Stores the version installed for each service # --------------------------------------------- -RUN cd /var/www && node git-revision > revisions.txt +RUN cd /var/www && ./git-revision.sh > revisions.txt # Set Environment Variables diff --git a/server-ce/git-revision.js b/server-ce/git-revision.js deleted file mode 100644 index 89359cea2e..0000000000 --- a/server-ce/git-revision.js +++ /dev/null @@ -1,22 +0,0 @@ -var simple = require('simple-git'); -var services = require('./sharelatex/config/services'); -const fs = require('fs'); - -function print_latest(repoDir) { - git = simple(repoDir); - opt = []; - opt['max-count'] = 1; - git.log(opt, function(err, log) { - if (!err) { - console.log(repoDir + ',' + log.latest.hash); - } - }) -} - -for (id in services) { - service = services[id]; - dirPath = __dirname + '/sharelatex/'+service.name; - if (fs.existsSync(dirPath)) { - print_latest(dirPath); - } -} diff --git a/server-ce/git-revision.sh b/server-ce/git-revision.sh new file mode 100755 index 0000000000..e26f75bfd4 --- /dev/null +++ b/server-ce/git-revision.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +for gitDir in $(find "$PWD" -name .git); do + echo -n "$(dirname ${gitDir})," + git --git-dir="$gitDir" rev-parse HEAD +done