Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
088cc5aef0 | ||
| b0eb56468e |
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -2,7 +2,7 @@ pipeline {
|
|||||||
agent any
|
agent any
|
||||||
|
|
||||||
environment {
|
environment {
|
||||||
REGISTRY_URL = "registry.pablotj.com"
|
REGISTRY_URL = "registry.nortapp.com"
|
||||||
USER = "andromeda"
|
USER = "andromeda"
|
||||||
PASS = credentials('docker-registry-password')
|
PASS = credentials('docker-registry-password')
|
||||||
}
|
}
|
||||||
|
|||||||
6
Makefile
6
Makefile
@@ -2,13 +2,10 @@ STACK=pablotj-portfolio
|
|||||||
APP_NAME=pablotj-portfolio-web
|
APP_NAME=pablotj-portfolio-web
|
||||||
IMAGE_NAME=$(APP_NAME)
|
IMAGE_NAME=$(APP_NAME)
|
||||||
|
|
||||||
REGISTRY_URL=registry.pablotj.com
|
REGISTRY_URL=registry.nortapp.com
|
||||||
NAMESPACE=andromeda
|
NAMESPACE=andromeda
|
||||||
TAG?=latest
|
TAG?=latest
|
||||||
|
|
||||||
HOST_PORT=8180
|
|
||||||
CONTAINER_PORT=80
|
|
||||||
|
|
||||||
IMAGE_FULL=$(REGISTRY_URL)/$(NAMESPACE)/$(IMAGE_NAME):$(TAG)
|
IMAGE_FULL=$(REGISTRY_URL)/$(NAMESPACE)/$(IMAGE_NAME):$(TAG)
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@@ -26,7 +23,6 @@ run:
|
|||||||
--label com.docker.compose.service="$(APP_NAME)" \
|
--label com.docker.compose.service="$(APP_NAME)" \
|
||||||
--label com.docker.compose.project="$(STACK)" \
|
--label com.docker.compose.project="$(STACK)" \
|
||||||
--network andromeda \
|
--network andromeda \
|
||||||
-p $(HOST_PORT):$(CONTAINER_PORT) \
|
|
||||||
--env-file .env \
|
--env-file .env \
|
||||||
$(IMAGE_FULL)
|
$(IMAGE_FULL)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user