Skip to content

Commit 784019c

Browse files
committed
ci
1 parent 27b7f52 commit 784019c

6 files changed

Lines changed: 61 additions & 5 deletions

File tree

.github/workflows/main.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: CI
2+
on:
3+
- push
4+
5+
jobs:
6+
build:
7+
strategy:
8+
matrix:
9+
variant: [
10+
"cache",
11+
"iris"
12+
]
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@master
16+
- name: Login to Docker Registry
17+
run: docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
18+
env:
19+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
20+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
21+
- name: Build and push
22+
run: make ${{ matrix.variant }}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ node_modules
22
dist
33
/temp/
44
build
5-
.vscode

.vscode/settings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"objectscript.conn": {
3+
"active": true,
4+
"ns": "BLOCKS",
5+
"docker-compose": {
6+
"service": "server"
7+
}
8+
}
9+
}

Dockerfile.iris

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ RUN npm install \
1010

1111
FROM store/intersystems/iris-community:2020.1.0.202.0
1212

13-
WORKDIR /opt/blocks/
13+
WORKDIR /opt/blocks
14+
15+
USER root
16+
17+
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} ${PWD}
18+
19+
USER irisowner
1420

1521
COPY ./server/src/ ./src
1622
COPY --from=web /opt/blocks/build/ /usr/irissys/csp/blocks/

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,26 @@ You need license key for Caché or IRIS on RedHat systems.
2020
##### Caché
2121
```
2222
docker run -d --name blocksexplorer --rm \
23-
-p 52773:52773 \
23+
-p 57772:57772 \
2424
-v /opt/some/database/for/test:/opt/blocks/db/test \
25-
-v ~/cache.key:/usr/cachesys/mgr/cache.key
25+
-v ~/cache.key:/usr/cachesys/mgr/cache.key \
2626
daimor/blocksexplorer:cache
2727
```
2828
##### IRIS
2929
```
3030
docker run -d --name blocksexplorer --rm \
31-
-p 57772:57772 \
31+
-p 52773:52773 \
3232
-v /opt/some/database/for/test:/opt/blocks/db/test \
3333
daimor/blocksexplorer:iris
3434
```
3535

36+
#### Development mode
37+
Run with docker-compose, will start web part with hot reloading.
38+
```
39+
docker-compose up -d
40+
```
41+
By default running on 80 port. To start using it, just open http://localhost/
42+
3643
## Screenshots
3744

3845
![Tree](https://cloud.githubusercontent.com/assets/1212251/9978584/f4964ada-5f40-11e5-8b23-2d20cb03e7b1.png)

makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
IMAGE=daimor/blocksexplorer
2+
3+
PHONY = cache iris
4+
5+
cache:
6+
docker build -t $(IMAGE):cache .
7+
docker push $(IMAGE):cache
8+
9+
iris:
10+
docker build -f Dockerfile.iris -t $(IMAGE):iris .
11+
docker push $(IMAGE):iris
12+
13+
default: cache iris

0 commit comments

Comments
 (0)