Compare commits
1 Commits
0.0.1-feat
...
feat/jenki
Author | SHA1 | Date | |
---|---|---|---|
aeb5a75cf1 |
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@ -8,25 +8,17 @@ symfonyAppPipeline('ubuntu:22.04', [
|
||||
'hooks': [
|
||||
// Run docker image build, verification and publication stages
|
||||
'postSymfonyAppPipeline': {
|
||||
stage('Build and publish hydra-dispatcher image') {
|
||||
stage('Build and publish docker images') {
|
||||
// Retrieve current tag
|
||||
String currentTag = sh(script: 'git tag --points-at HEAD | head -n 1', returnStdout: true).trim()
|
||||
// Retrieve default tag
|
||||
String defaultTag = sh(returnStdout: true, script: 'git describe --always').trim()
|
||||
container.buildAndPublishImage([
|
||||
kubecontainer.buildAndPublishImage([
|
||||
'imageName': 'reg.cadoles.com/pcaseiro/myapplication-standalone',
|
||||
// Use current tag or default tag if not defined
|
||||
'imageTag': defaultTag,
|
||||
'dockerfile': './misc/images/myapplication-standalone/Dockerfile',
|
||||
'dryRun': false
|
||||
])
|
||||
container.buildAndPublishImage([
|
||||
'imageName': 'reg.cadoles.com/pcaseiro/myapplication-kube',
|
||||
// Use current tag or default tag if not defined
|
||||
'imageTag': defaultTag,
|
||||
'dockerfile': './misc/images/myapplication-kube/Dockerfile',
|
||||
'dryRun': false
|
||||
])
|
||||
}
|
||||
}
|
||||
]
|
||||
|
16
Makefile
16
Makefile
@ -1,12 +1,12 @@
|
||||
################################
|
||||
# Makefile for Cadoles SP
|
||||
################################
|
||||
|
||||
IMAGE_REPO ?= reg.cadoles.com/cadoles
|
||||
IMAGE_VERSION ?= 0.0.1
|
||||
|
||||
DAY_SUFFIX_TAG ?= $(shell date +%Y%m%d)
|
||||
##################################################
|
||||
# Makefile for Cadoles Kubernetes Skeletor project
|
||||
##################################################
|
||||
|
||||
COMMIT_ID ?= $(shell git rev-parse --short --verify HEAD)
|
||||
CURRENT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]')
|
||||
|
||||
IMAGE_REPO ?= reg.cadoles.com/cadoles
|
||||
IMAGE_VERSION ?= 0.0.1-$(CURRENT_BRANCH)
|
||||
|
||||
|
||||
include main.mk
|
||||
|
4
main.mk
4
main.mk
@ -30,8 +30,8 @@ endef
|
||||
define release_image
|
||||
docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-$(COMMIT_ID) ; \
|
||||
docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:$(IMAGE_VERSION); \
|
||||
docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:latest ; \
|
||||
docker push $(IMAGE_REPO)/$1:latest ; \
|
||||
docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-latest; \
|
||||
docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-latest ; \
|
||||
docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION) ; \
|
||||
docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-$(COMMIT_ID)
|
||||
endef
|
||||
|
@ -1,4 +0,0 @@
|
||||
- op: add
|
||||
path: "/spec/template/spec/imagePullSecrets"
|
||||
value:
|
||||
- name: regcred-dev
|
Reference in New Issue
Block a user