Skip to content

Commit bd26aff

Browse files
authored
Ticket/opi 1110 fix for commerce demo (#38692)
* OPI-1110 Run CI in docker - fix nginx configuration for subfolder - sanitize docker image tag - update compose configuration for public applications
1 parent d3effe0 commit bd26aff

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.env-build

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ ORO_IMAGE=${ORO_PROJECT}orocommerce-application
22
ORO_IMAGE_TEST=${ORO_IMAGE}-test
33
ORO_IMAGE_INIT=${ORO_IMAGE}-init
44
ORO_IMAGE_INIT_TEST=${ORO_IMAGE}-init-test
5+
ORO_SAMPLE_DATA = 'y'

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pipeline {
3232
error message:"ERROR: Cannot perform git checkout!, Reason: '${error}'"
3333
}
3434
defaultVariables = readProperties(interpolate: true, file: "$WORKSPACE/.build/docker-compose/.env")
35-
readProperties(interpolate: true, defaults: defaultVariables + [ORO_IMAGE_TAG: env.BUILD_TAG], file: "$WORKSPACE/.env-build").each {key, value -> env[key] = value }
35+
readProperties(interpolate: true, defaults: defaultVariables + [ORO_IMAGE_TAG: env.BUILD_TAG.replaceAll("\\%2F", "-").replaceAll('\\.', '').replaceAll('_', '-').toLowerCase()], file: "$WORKSPACE/.env-build").each {key, value -> env[key] = value }
3636
dockerLabels = ['--label "org.opencontainers.image.title=OroCommerce Application"', '--label "org.opencontainers.image.description=OroCommerce Application"', '--label "org.opencontainers.image.authors=ORO Inc."', '--label "org.opencontainers.image.vendor=ORO Inc."', "--label \"org.opencontainers.image.revision=${GIT_COMMIT}\"","--label \"org.opencontainers.image.source=${env.GIT_URL}\"", "--label \"org.opencontainers.image.created=${env.BUILD_TIMESTAMP}\"", "--label \"com.oroinc.orocloud.reference=${env.GIT_BRANCH}\"", '--label "com.oroinc.orocloud.composer=composer.json"']
3737
if (env.TAG_NAME) { dockerLabels.add("--label \"org.opencontainers.image.version=${env.TAG_NAME}\"") }
3838

0 commit comments

Comments
 (0)