Compare commits
5 Commits
c6ecb4cc4b
...
v14
| Author | SHA1 | Date | |
|---|---|---|---|
|
daef0ef378
|
|||
|
|
db3b875005 | ||
|
|
82b78116e9 | ||
| 9987810cca | |||
| f8d8671ef2 |
4
.github/workflows/docker-publish.yml
vendored
4
.github/workflows/docker-publish.yml
vendored
@@ -2,8 +2,7 @@ name: Docker CI
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches: [ main ]
|
||||||
- 'master'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
docker:
|
docker:
|
||||||
@@ -21,7 +20,6 @@ jobs:
|
|||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
-
|
-
|
||||||
name: Build and Push from Makefile
|
name: Build and Push from Makefile
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
7
Makefile
7
Makefile
@@ -1,13 +1,10 @@
|
|||||||
DOCKER_IMAGE=cubetiq/calpine-node
|
DOCKER_IMAGE=cubetiq/calpine-node:14
|
||||||
DOCKER_IMAGE_NAME=${DOCKER_IMAGE}:14
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@echo 'Starting docker build'
|
@echo 'Starting docker build'
|
||||||
docker build . -t ${DOCKER_IMAGE}
|
docker build . -t ${DOCKER_IMAGE}
|
||||||
|
|
||||||
@echo 'Starting docker push'
|
@echo 'Starting docker push'
|
||||||
docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_NAME}
|
docker tag ${DOCKER_IMAGE}
|
||||||
docker push ${DOCKER_IMAGE}
|
docker push ${DOCKER_IMAGE}
|
||||||
docker push ${DOCKER_IMAGE_NAME}
|
|
||||||
|
|
||||||
.PHONY:build
|
.PHONY:build
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "excel2json",
|
"name": "excel2json",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "",
|
"description": "Excel to json",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node index.js",
|
"start": "node index.js",
|
||||||
|
|||||||
Reference in New Issue
Block a user