CadolesKube/symfony-kube-skeletor
Template
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CadolesKube:3a9dc1ae213fe1c6309d600dd8fa3eeb4206c35e
Branches Tags
CadolesKube:stable
CadolesKube:test
CadolesKube:dev
CadolesKube:fix/iniapp
CadolesKube:fix/nginx
CadolesKube:feat/jenkins
CadolesKube:feat/automation
CadolesKube:0.0.1-feat_jenkins-latest
CadolesKube:0.0.1-feat_jenkins-13ac2b6
CadolesKube:0.0.1-feat_jenkins
..
compare: CadolesKube:f08ffe10d838dd8f6d1ae2a0ab4ffa86919ba891
Branches Tags
CadolesKube:stable
CadolesKube:test
CadolesKube:dev
CadolesKube:fix/iniapp
CadolesKube:fix/nginx
CadolesKube:feat/jenkins
CadolesKube:feat/automation
CadolesKube:0.0.1-feat_jenkins-latest
CadolesKube:0.0.1-feat_jenkins-13ac2b6
CadolesKube:0.0.1-feat_jenkins

No commits in common. "3a9dc1ae213fe1c6309d600dd8fa3eeb4206c35e" and "f08ffe10d838dd8f6d1ae2a0ab4ffa86919ba891" have entirely different histories.
3a9dc1ae21 ... f08ffe10d8

3 changed files with 20 additions and 21 deletions
Show Stats Expand all files Collapse all files

24
Jenkinsfile vendored
View File

@ -13,16 +13,20 @@ symfonyAppPipeline('ubuntu:22.04', [
String currentTag = sh(script: 'git tag --points-at HEAD | head -n 1', returnStdout: true).trim() String currentTag = sh(script: 'git tag --points-at HEAD | head -n 1', returnStdout: true).trim()
// Retrieve default tag // Retrieve default tag
String defaultTag = sh(returnStdout: true, script: 'git describe --always').trim() String defaultTag = sh(returnStdout: true, script: 'git describe --always').trim()
job('Building docker images') { container.buildAndPublishImage([
steps { 'imageName': 'reg.cadoles.com/pcaseiro/myapplication-standalone',
shell('make') // Use current tag or default tag if not defined
} 'imageTag': defaultTag,
} 'dockerfile': './misc/images/myapplication-standalone/Dockerfile',
job('Publishing docker images') { 'dryRun': false
steps { ])
shell('make release') 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
])
} }
} }
] ]

8
Makefile
View File

@ -2,11 +2,9 @@
# Makefile for Cadoles SP # Makefile for Cadoles SP
################################ ################################
COMMIT_ID ?= $(shell git rev-parse --short --verify HEAD) IMAGE_REPO := reg.cadoles.com/cadoles
CURRENT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') IMAGE_VERSION ?= 0.0.1
IMAGE_REPO ?= reg.cadoles.com/cadoles
IMAGE_VERSION ?= 0.0.1-$(CURRENT_BRANCH)
DAY_SUFFIX_TAG ?= $(shell date +%Y%m%d)
include main.mk include main.mk

9
main.mk
View File

@ -28,12 +28,12 @@ define install_trivy
endef endef
define release_image 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)-$(DAY_SUFFIX_TAG) ; \
docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:$(IMAGE_VERSION); \ docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:$(IMAGE_VERSION); \
docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:latest ; \ docker tag $(IMAGE_REPO)/$1:$(IMAGE_VERSION) $(IMAGE_REPO)/$1:latest ; \
docker push $(IMAGE_REPO)/$1:latest ; \ docker push $(IMAGE_REPO)/$1:latest ; \
docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION) ; \ docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION) ; \
docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-$(COMMIT_ID) docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-$(DAY_SUFFIX_TAG)
endef endef
#list: #list:
@ -57,12 +57,9 @@ release: ${IMAGES_DIR}/*
@for name in $(basename $(notdir $^)); do \ @for name in $(basename $(notdir $^)); do \
$(call release_image,$${name},base); \ $(call release_image,$${name},base); \
done;\ done;\
git tag -f -a $(IMAGE_VERSION) -m "Version $(IMAGE_VERSION) released"; \
git tag -f -a $(IMAGE_VERSION)-$(COMMIT_ID) -m "Version $(IMAGE_VERSION)-$(COMMIT_ID) released"; \
git tag -f -a $(IMAGE_VERSION)-latest -m "Version $(IMAGE_VERSION)-latest released"; \
_release: _release:
docker tag $(IMAGE_FULL_NAME):$(IMAGE_TAG) $(IMAGE_FULL_NAME):$(IMAGE_TAG)-$(IMAGE_VERSION)-$(COMMIT_ID) docker tag $(IMAGE_FULL_NAME):$(IMAGE_TAG) $(IMAGE_FULL_NAME):$(IMAGE_TAG)-$(IMAGE_VERSION)-$(DAY_SUFFIX_TAG)
docker tag $(IMAGE_FULL_NAME):$(IMAGE_TAG) $(IMAGE_FULL_NAME):$(IMAGE_TAG)-$(IMAGE_VERSION) docker tag $(IMAGE_FULL_NAME):$(IMAGE_TAG) $(IMAGE_FULL_NAME):$(IMAGE_TAG)-$(IMAGE_VERSION)
docker tag $(IMAGE_FULL_NAME):$(IMAGE_TAG) $(IMAGE_FULL_NAME):$(IMAGE_TAG)-latest docker tag $(IMAGE_FULL_NAME):$(IMAGE_TAG) $(IMAGE_FULL_NAME):$(IMAGE_TAG)-latest
docker push $(IMAGE_FULL_NAME):$(IMAGE_TAG)-$(IMAGE_VERSION)-$(DAY_SUFFIX_TAG) docker push $(IMAGE_FULL_NAME):$(IMAGE_TAG)-$(IMAGE_VERSION)-$(DAY_SUFFIX_TAG)