diff --git a/packages/augur-ui/config/webpack.common.config.js b/packages/augur-ui/config/webpack.common.config.js index d23cbd69911..f02d352a6d8 100644 --- a/packages/augur-ui/config/webpack.common.config.js +++ b/packages/augur-ui/config/webpack.common.config.js @@ -23,11 +23,12 @@ const PATHS = { const AUGUR_ENV = process.env.AUGUR_ENV || process.env.ETHEREUM_NETWORK || 'local'; const config = buildConfig(AUGUR_ENV); -if(!process.env.CURRENT_COMMITHASH) { +if(!process.env.CURRENT_COMMITHASH || !process.env.CURRENT_VERSION) { const gitRevisionPlugin = new GitRevisionPlugin({ branch: false }); - process.env.CURRENT_COMMITHASH = gitRevisionPlugin.commithash(); + process.env.CURRENT_COMMITHASH = process.env.CURRENT_COMMITHASH || gitRevisionPlugin.commithash(); + process.env.CURRENT_VERSION = process.env.CURRENT_VERSION || gitRevisionPlugin.version(); } module.exports = { @@ -237,6 +238,7 @@ module.exports = { AUGUR_ENV: JSON.stringify(AUGUR_ENV), AUTO_LOGIN: process.env.AUTO_LOGIN || false, CURRENT_COMMITHASH: JSON.stringify(process.env.CURRENT_COMMITHASH), + CURRENT_VERSION: JSON.stringify(process.env.CURRENT_VERSION), ETHEREUM_NETWORK: JSON.stringify(AUGUR_ENV), IPFS_STABLE_LOADER_HASH: JSON.stringify(process.env.IPFS_STABLE_LOADER_HASH), diff --git a/support/Dockerfile b/support/Dockerfile index 68b92d33d79..aeddbd63caf 100644 --- a/support/Dockerfile +++ b/support/Dockerfile @@ -15,6 +15,8 @@ RUN apk add --no-cache \ musl-dev \ openssl-dev +ARG CURRENT_VERSION +ENV CURRENT_VERSION=$CURRENT_VERSION ARG CURRENT_COMMITHASH="COMMIT HASH NOT AVAILABLE" ENV CURRENT_COMMITHASH=$CURRENT_COMMITHASH diff --git a/support/build_image.sh b/support/build_image.sh index fb14ed0b64c..3a43422e875 100755 --- a/support/build_image.sh +++ b/support/build_image.sh @@ -13,5 +13,6 @@ yarn workspace orbit-web build; docker build . \ -f support/Dockerfile \ --build-arg CURRENT_COMMITHASH="$(git rev-parse HEAD)" \ + --build-arg CURRENT_VERSION=$VERSION -t augurproject/augur:runner \ -t "augurproject/augur:v$VERSION";