Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OSUG
JMMC
jmmc-obsportal
Commits
8ded7679
Commit
8ded7679
authored
Apr 16, 2020
by
bourgesl
Browse files
Merge branch 'release/2020_04_16_b1'
parents
688274dd
e335db70
Pipeline
#41621
passed with stage
in 2 minutes and 40 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
8ded7679
...
...
@@ -22,5 +22,5 @@ build obs:
<<
:
*docker_build
variables
:
IMAGE
:
obs
IMAGE_TAG
:
"
latest
"
IMAGE_TAG
:
"
2020_04_16_b1
"
README.md
View file @
8ded7679
...
...
@@ -105,3 +105,27 @@ Build Docker image:
*
Use bash in container:
docker exec -it d_obsportal bash
*******************
Publish release:
*******************
TAG='2020_04_16'
git pull
git checkout master
git flow release start $TAG
git merge develop
git flow release finish $TAG
git push # master
git push --tags
git checkout develop
git push
That's All, folks !
production.ini-dist
View file @
8ded7679
...
...
@@ -3,8 +3,8 @@
# https://pastedeploy.readthedocs.io/en/latest/#global-configuration
#################################################
[DEFAULT]
global.paths.data = /data
global.paths.logs = /logs
global.paths.data = /data
/cache
global.paths.logs = /logs
/blue
global.paths.tmp = /tmp
global.environment = production
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment