diff --git a/docker/Dockerfile b/docker/Dockerfile index 2f78dd0ac..606d0c12a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,14 +1,13 @@ FROM node:11.1.0-alpine -RUN apk add nss git openjdk8-jre openjdk8 maven python alpine-sdk libxml2-dev yarn g++ gcc bash raptor2 jq +RUN apk add nss git openjdk8-jre openjdk8 maven python alpine-sdk libxml2-dev yarn g++ gcc bash raptor2 jq curl WORKDIR /synbiohub COPY . . -# RUN rm -rf .git +RUN git config --global url."https://".insteadOf git:// RUN cd java && mvn package -RUN git config --global url."https://".insteadOf git:// RUN yarn install COPY docker/config.local.json config.initial.local.json @@ -18,6 +17,7 @@ COPY docker/first_run.sh first_run.sh EXPOSE 7777 -HEALTHCHECK --start-period=60s CMD ["node", "healthcheck.js"] -ENTRYPOINT ["./entry.sh"] +HEALTHCHECK --interval=10s --timeout=10s --start-period=20s --retries=5 \ + CMD ["node", "healthcheck.js"] +ENTRYPOINT ["./docker/entry.sh"] diff --git a/docker/healthcheck.js b/docker/healthcheck.js deleted file mode 100644 index b193f8135..000000000 --- a/docker/healthcheck.js +++ /dev/null @@ -1,10 +0,0 @@ -const axios = require('axios') -const config = require('./lib/config') - -const url = 'http://localhost:' + config.get('port') + '/' - -axios.get(url).then(response => { - return process.exit(0) -}).catch(error => { - return process.exit(1) -}) diff --git a/gitrevupdate.js b/gitrevupdate.js new file mode 100644 index 000000000..eb2aed785 --- /dev/null +++ b/gitrevupdate.js @@ -0,0 +1,18 @@ +#!/usr/bin/env node + +const config = require('./lib/config') +const gitRev = require('./lib/gitRevision') + +console.log('Updating git revision in configuration...') + +// Get the current git revision +const revision = gitRev() + +if (revision) { + // Set the revision in the config + config.set('revision', revision) + console.log(`Git revision updated to: ${revision}`) +} else { + console.error('Failed to get git revision') + process.exit(1) +} \ No newline at end of file diff --git a/lib/config.js b/lib/config.js index 1f7652c09..3953c4a3a 100644 --- a/lib/config.js +++ b/lib/config.js @@ -1,4 +1,3 @@ - var fs = require('fs') var extend = require('xtend') var deepmerge = require('deepmerge') diff --git a/synbiohub.js b/synbiohub.js index 0096eac47..e0e8b15d3 100644 --- a/synbiohub.js +++ b/synbiohub.js @@ -4,6 +4,7 @@ const db = require('./lib/db') const fs = require('fs') const jobUtils = require('./lib/jobs/job-utils') const java = require('./lib/java') +const logger = require('./lib/logger') const gitRev = require('./lib/gitRevision') const theme = require('./lib/theme') const loggerOverride = require('./lib/loggerOverride') @@ -19,8 +20,6 @@ if (!fs.existsSync('synbiohub.sqlite') || fs.statSync('synbiohub.sqlite').size = db.umzug.up().then(startServer) } -config.set('revision', gitRev()) - async function startServer () { await java.init() await theme.setCurrentThemeFromConfig()