mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #1311 from MetaMask/mascara-publish
Mascara - docker support
This commit is contained in:
commit
4a42ac86a0
3
.dockerignore
Normal file
3
.dockerignore
Normal file
@ -0,0 +1,3 @@
|
||||
node_modules
|
||||
builds
|
||||
development
|
22
Dockerfile
Normal file
22
Dockerfile
Normal file
@ -0,0 +1,22 @@
|
||||
FROM node:6
|
||||
MAINTAINER kumavis
|
||||
|
||||
# setup app dir
|
||||
RUN mkdir -p /www/
|
||||
WORKDIR /www/
|
||||
|
||||
# install dependencies
|
||||
COPY ./package.json /www/package.json
|
||||
RUN npm install
|
||||
|
||||
# copy over app dir
|
||||
COPY ./ /www/
|
||||
|
||||
# run tests
|
||||
# RUN npm test
|
||||
|
||||
# build app
|
||||
RUN npm run dist
|
||||
|
||||
# start server
|
||||
CMD node mascara/example/server.js
|
11
docker-compose.yml
Normal file
11
docker-compose.yml
Normal file
@ -0,0 +1,11 @@
|
||||
metamascara:
|
||||
build: ./
|
||||
restart: always
|
||||
ports:
|
||||
- "9001"
|
||||
environment:
|
||||
MASCARA_ORIGIN: "https://zero.metamask.io"
|
||||
VIRTUAL_PORT: "9001"
|
||||
VIRTUAL_HOST: "zero.metamask.io"
|
||||
LETSENCRYPT_HOST: "zero.metamask.io"
|
||||
LETSENCRYPT_EMAIL: "admin@metamask.io"
|
@ -8,10 +8,10 @@ module.exports = createMetamascaraServer
|
||||
function createMetamascaraServer(){
|
||||
|
||||
// start bundlers
|
||||
const metamascaraBundle = createBundle('./src/mascara.js')
|
||||
const proxyBundle = createBundle('./src/proxy.js')
|
||||
const uiBundle = createBundle('./src/ui.js')
|
||||
const backgroundBuild = createBundle('./src/background.js')
|
||||
const metamascaraBundle = createBundle(__dirname + '/../src/mascara.js')
|
||||
const proxyBundle = createBundle(__dirname + '/../src/proxy.js')
|
||||
const uiBundle = createBundle(__dirname + '/../src/ui.js')
|
||||
const backgroundBuild = createBundle(__dirname + '/../src/background.js')
|
||||
|
||||
// serve bundles
|
||||
const server = express()
|
||||
|
@ -1,44 +1,41 @@
|
||||
const Web3 = require('web3')
|
||||
const setupProvider = require('./lib/setup-provider.js')
|
||||
|
||||
const MASACARA_DOMAIN = 'http://localhost:9001'
|
||||
const MASCARA_ORIGIN = process.env.MASCARA_ORIGIN || 'http://localhost:9001'
|
||||
console.log('MASCARA_ORIGIN:', MASCARA_ORIGIN)
|
||||
|
||||
//
|
||||
// setup web3
|
||||
//
|
||||
|
||||
var provider = setupProvider({
|
||||
mascaraUrl: MASACARA_DOMAIN + '/proxy/',
|
||||
const provider = setupProvider({
|
||||
mascaraUrl: MASCARA_ORIGIN + '/proxy/',
|
||||
})
|
||||
instrumentForUserInteractionTriggers(provider)
|
||||
|
||||
var web3 = new Web3(provider)
|
||||
web3.setProvider = function(){
|
||||
console.log('MetaMask - overrode web3.setProvider')
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
// export web3
|
||||
//
|
||||
|
||||
const web3 = new Web3(provider)
|
||||
global.web3 = web3
|
||||
|
||||
//
|
||||
// ui stuff
|
||||
//
|
||||
|
||||
var shouldPop = false
|
||||
window.addEventListener('click', function(){
|
||||
let shouldPop = false
|
||||
window.addEventListener('click', maybeTriggerPopup)
|
||||
|
||||
//
|
||||
// util
|
||||
//
|
||||
|
||||
function maybeTriggerPopup(){
|
||||
if (!shouldPop) return
|
||||
shouldPop = false
|
||||
window.open(MASACARA_DOMAIN, '', 'width=360 height=500')
|
||||
window.open(MASCARA_ORIGIN, '', 'width=360 height=500')
|
||||
console.log('opening window...')
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
function instrumentForUserInteractionTriggers(provider){
|
||||
var _super = provider.sendAsync.bind(provider)
|
||||
const _super = provider.sendAsync.bind(provider)
|
||||
provider.sendAsync = function(payload, cb){
|
||||
if (payload.method === 'eth_sendTransaction') {
|
||||
console.log('saw send')
|
||||
|
@ -33,6 +33,7 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"envify",
|
||||
"brfs"
|
||||
]
|
||||
},
|
||||
@ -127,6 +128,7 @@
|
||||
"clone": "^1.0.2",
|
||||
"deep-freeze-strict": "^1.1.1",
|
||||
"del": "^2.2.0",
|
||||
"envify": "^4.0.0",
|
||||
"fs-promise": "^1.0.0",
|
||||
"gulp": "github:gulpjs/gulp#4.0",
|
||||
"gulp-if": "^2.0.1",
|
||||
|
Loading…
Reference in New Issue
Block a user