Skip to content

Build ProcessMaker API dependency #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nolanpro merged 4 commits into from
Jan 16, 2020
Merged

Build ProcessMaker API dependency #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b0ac78
Build processmaker api dependency
caleeli Jan 16, 2020
9954de5
Cleanup
nolanpro Jan 16, 2020
a8637f2
Catch script error and return it to the console
caleeli Jan 16, 2020
d9d7851
Merge branch 'fixProcessMakerApiBuild' of https://github.com/ProcessM…
caleeli Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ FROM node:8.15.0
COPY /src /opt/executor
WORKDIR /opt/executor
RUN if [ ! -d "sdk-node" ]; then git clone --depth 1 https://github.com/ProcessMaker/sdk-node.git; fi
RUN cd /opt/executor/sdk-node; npm install
RUN cd /opt/executor/sdk-node; npm run-script build
RUN npm install
15 changes: 4 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,12 @@ A docker image that allows executing native ES6 in [ProcessMaker 4](https://gith
### Building

To build from the master branch of the SDK at https://github.com/ProcessMaker/sdk-node.
This will build the image as processmaker/docker-executor-node:dev-master
This will build the image as processmaker4/executor-node:latest

`./build.sh`
`docker build -t processmaker4/executor-node:latest .`

You can specify a branch from the SDK repo with the BRANCH env var.
This will use that branch and build the as processmaker/docker-executor-node:feature-123

`BRANCH=feature/123 ./build.sh`

You can specify a tag.
This will build the image from the master SDK branch as processmaker/docker-executor-node:test-123

`TAG=test-123 ./build.sh`
If you want to use a different branch or local build of the sdk, you can copy it to `./src/sdk-node`
and it will be used instead of cloning from github.

### Scripts
The javascript must return either an object, a promise that resolves to an object, or nothing.
Expand Down
16 changes: 0 additions & 16 deletions build.sh
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Promise.all([getConfig, getData]).then(function(values) {
// Nothing to output
return writeScriptOutput('');
} else if (typeof result === 'object') {
result = Object.assign({}, data, result)
return writeScriptOutput(JSON.stringify(result));
} else {
console.log(
Expand All @@ -51,5 +50,7 @@ Promise.all([getConfig, getData]).then(function(values) {
"Got a " + typeof result)
return
}
}).catch((error) => {
console.error(error);
})
})
2 changes: 1 addition & 1 deletion src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"main": "bootstrap.js",
"dependencies": {
"process_maker_api": "file:./sdk-node"
"process_maker_api": "./sdk-node"
},
"devDependencies": {},
"scripts": {
Expand Down