Skip to content

Commit

Permalink
Merge pull request #117 from BlocknetDX/1.0.0
Browse files Browse the repository at this point in the history
1.0.0
  • Loading branch information
magic53 committed Feb 7, 2019
2 parents b86f2e4 + 1ccaa13 commit 485f7c9
Show file tree
Hide file tree
Showing 218 changed files with 3,629 additions and 1,072 deletions.
3 changes: 2 additions & 1 deletion .angular-cli.json
Expand Up @@ -16,7 +16,8 @@
"settings.html",
"tos.html",
"update-available.html",
"general-settings.html"
"general-settings.html",
"information.html"
],
"index": "index.html",
"main": "main.ts",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-linux
Expand Up @@ -16,4 +16,4 @@ ARG GIT_BRANCH=""
RUN echo GIT_BRANCH=$GIT_BRANCH > /opt/blockdx-ui/electron-builder.env

ENTRYPOINT ["npm"]
CMD ["run", "build-native-linux"]
CMD ["run", "build-gitlab-linux"]
2 changes: 1 addition & 1 deletion Dockerfile-mac
Expand Up @@ -31,4 +31,4 @@ ARG GIT_BRANCH=""
RUN echo GIT_BRANCH=$GIT_BRANCH > /opt/blockdx-ui/electron-builder.env

ENTRYPOINT ["npm"]
CMD ["run", "build-native-mac"]
CMD ["run", "build-gitlab-mac"]
19 changes: 19 additions & 0 deletions Dockerfile-publish-linux
@@ -0,0 +1,19 @@
FROM electronuserland/builder:10

# Create app directory
RUN mkdir -p /opt/blockdx-ui/dist-native
WORKDIR /opt/blockdx-ui/
VOLUME /opt/blockdx-ui/dist-native

# Install app dependencies
COPY package.json /opt/blockdx-ui/
RUN npm install --no-audit

# Bundle app source
COPY . /opt/blockdx-ui/

ARG GIT_BRANCH=""
RUN echo GIT_BRANCH=$GIT_BRANCH > /opt/blockdx-ui/electron-builder.env

ENTRYPOINT ["npm"]
CMD ["run", "publish-native-linux"]
19 changes: 19 additions & 0 deletions Dockerfile-publish-win
@@ -0,0 +1,19 @@
FROM electronuserland/builder:wine

# Create app directory
RUN mkdir -p /opt/blockdx-ui/dist-native
WORKDIR /opt/blockdx-ui/
VOLUME /opt/blockdx-ui/dist-native

# Install app dependencies
COPY package.json /opt/blockdx-ui/
RUN npm install --no-audit

# Bundle app source
COPY . /opt/blockdx-ui/

ARG GIT_BRANCH=""
RUN echo GIT_BRANCH=$GIT_BRANCH > /opt/blockdx-ui/electron-builder.env

ENTRYPOINT ["npm"]
CMD ["run", "publish-native-win"]
2 changes: 1 addition & 1 deletion Dockerfile-win
Expand Up @@ -16,4 +16,4 @@ ARG GIT_BRANCH=""
RUN echo GIT_BRANCH=$GIT_BRANCH > /opt/blockdx-ui/electron-builder.env

ENTRYPOINT ["npm"]
CMD ["run", "build-native-win"]
CMD ["run", "build-gitlab-win"]
5 changes: 4 additions & 1 deletion README.md
@@ -1,6 +1,9 @@
![BLOCK DX](BLOCKDX.png)

BLOCK DX is the first dapp built on top of the Blocknet Protocol. This repository is maintained by the Blocknet Core Team. We encourage the community to create dapps on top of Blocknet. Please connect with our community on discord. More information about Blocknet can be found at https://blocknet.co
BLOCK DX is the first dApp built on top of the [Blocknet Protocol](https://api.blocknet.co). This repository is maintained by the Blocknet Core Team. We encourage the community to create dApps on top of Blocknet. Please connect with our community on [Discord](https://discord.gg/2e6s7H8). More information about Blocknet can be found on the [Blocknet website](https://blocknet.co) and [documentation portal](https://docs.blocknet.co).

[Website](https://blocknet.co) | [API](https://api.blocknet.co) | [Documentation](https://docs.blocknet.co) | [Discord](https://discord.gg/2e6s7H8)
-------------|-------------|-------------|-------------

# Build and Run

Expand Down

0 comments on commit 485f7c9

Please sign in to comment.