Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Géocontrib Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GéoContrib
Géocontrib Frontend
Commits
038095f0
Commit
038095f0
authored
2 years ago
by
Sébastien DA ROCHA
Browse files
Options
Downloads
Patches
Plain Diff
Update docker-compose.yaml, .gitlab-ci.yml
parent
cd580d78
No related branches found
No related tags found
1 merge request
!472
Speedup CI (build docker)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+21
-29
21 additions, 29 deletions
.gitlab-ci.yml
docker-compose.yaml
+1
-1
1 addition, 1 deletion
docker-compose.yaml
with
22 additions
and
30 deletions
.gitlab-ci.yml
+
21
−
29
View file @
038095f0
...
@@ -25,16 +25,14 @@ build testing docker image:
...
@@ -25,16 +25,14 @@ build testing docker image:
only
:
only
:
-
develop
-
develop
tags
:
tags
:
-
build
-
build_docker
image
:
variables
:
name
:
gcr.io/kaniko-project/executor:debug
DOCKER_TAG
:
testing
entrypoint
:
[
"
"
]
script
:
script
:
-
mkdir -p /kaniko/.docker
-
cat $DOCKER_PASSWORD | docker login --username $DOCKER_LOGIN --password-stdin
-
export
-
docker-compose build geocontrib-front
-
echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
-
docker-compose push geocontrib-front
-
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:testing
-
echo Image docker neogeo/geocontrib-front:${DOCKER_TAG} livrée
-
echo Image docker neogeo/geocontrib-front:testing livrée
deploy testing docker image
:
deploy testing docker image
:
stage
:
deploy
stage
:
deploy
...
@@ -52,36 +50,30 @@ build stable docker image:
...
@@ -52,36 +50,30 @@ build stable docker image:
only
:
only
:
-
master
-
master
tags
:
tags
:
-
build
-
build_docker
image
:
variables
:
name
:
gcr.io/kaniko-project/executor:debug
DOCKER_TAG
:
latest
entrypoint
:
[
"
"
]
script
:
script
:
-
mkdir -p /kaniko/.docker
-
cat $DOCKER_PASSWORD | docker login --username $DOCKER_LOGIN --password-stdin
-
echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
-
docker-compose build geocontrib-front
-
docker-compose push geocontrib-front
-
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:latest
-
echo Image docker neogeo/geocontrib-front:${DOCKER_TAG} livrée
-
echo Image docker neogeo/geocontrib:latest livrée
build tagged docker image
:
build tagged docker image
:
stage
:
build
stage
:
build
only
:
only
:
-
tags
-
tags
tags
:
tags
:
-
build
-
build_docker
image
:
variables
:
name
:
gcr.io/kaniko-project/executor:debug
DOCKER_TAG
:
$CI_COMMIT_TAG
entrypoint
:
[
"
"
]
script
:
script
:
# Don't build tag id package.json as wrong version
# Don't build tag id package.json as wrong version
-
grep "\"version\":.\"$CI_COMMIT_TAG\"" package.json
-
grep "\"version\":.\"$CI_COMMIT_TAG\"" package.json
-
mkdir -p /kaniko/.docker
-
cat $DOCKER_PASSWORD | docker login --username $DOCKER_LOGIN --password-stdin
-
echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
-
docker-compose build geocontrib-front
-
docker-compose push geocontrib-front
-
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:$CI_COMMIT_TAG
-
echo Image docker neogeo/geocontrib-front:${DOCKER_TAG} livrée
-
echo Image docker neogeo/geocontrib-front:$CI_COMMIT_TAG livrée
sonarqube-check
:
sonarqube-check
:
image
:
image
:
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yaml
+
1
−
1
View file @
038095f0
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
version
:
"
3"
version
:
"
3"
services
:
services
:
geocontrib-front
:
geocontrib-front
:
image
:
neogeo/geocontrib-front:
geocontrib-latest
image
:
neogeo/geocontrib-front:
${DOCKER_TAG:-testing}
build
:
.
build
:
.
environment
:
environment
:
-
BASE_URL=${BASE_URL}
-
BASE_URL=${BASE_URL}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment