Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
5f7f5d92
Verified
Commit
5f7f5d92
authored
Dec 14, 2018
by
Sébastiaan Versteeg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to docker hub for images
parent
641dccde
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
.gitlab-ci.yml
.gitlab-ci.yml
+7
-6
docker-compose.yml
docker-compose.yml
+1
-1
No files found.
.gitlab-ci.yml
View file @
5f7f5d92
...
@@ -81,16 +81,17 @@ build docker image:
...
@@ -81,16 +81,17 @@ build docker image:
tags
:
tags
:
-
docker
-
docker
before_script
:
before_script
:
-
echo $
GITLAB_REGISTRY_PASSWORD | docker login --username thaliawww --password-stdin registry.gitlab
.com
-
echo $
DOCKER_REGISTRY_PASSWORD | docker login --username thaliawww --password-stdin registry.hub.docker
.com
script
:
script
:
-
docker-compose config -q
-
docker-compose config -q
-
docker-compose build --build-arg install_dev_requirements=0 --build-arg source_commit=$(git rev-parse HEAD) web
-
docker-compose build --build-arg install_dev_requirements=0 --build-arg source_commit=$(git rev-parse HEAD) web
-
docker-compose run --rm web test
-
docker-compose run --rm web test
-
docker tag $DOCKER_LATEST $DOCKER_TAG
-
docker tag $DOCKER_LATEST $DOCKER_TAG
-
docker push $DOCKER_LATEST
-
docker push $DOCKER_TAG
-
docker push $DOCKER_TAG
variables
:
variables
:
DOCKER_LATEST
:
registry.
gitlab.com/thaliawww
/concrexit:latest
DOCKER_LATEST
:
registry.
hub.docker.com/thalia
/concrexit:latest
DOCKER_TAG
:
registry.
gitlab.com/thaliawww
/concrexit:$CI_COMMIT_SHA
DOCKER_TAG
:
registry.
hub.docker.com/thalia
/concrexit:$CI_COMMIT_SHA
tag docker image
:
tag docker image
:
stage
:
deploy
stage
:
deploy
...
@@ -104,14 +105,14 @@ tag docker image:
...
@@ -104,14 +105,14 @@ tag docker image:
dependencies
:
dependencies
:
-
build docker image
-
build docker image
before_script
:
before_script
:
-
echo $
GITLAB_REGISTRY_PASSWORD | docker login --username thaliawww --password-stdin registry.gitlab
.com
-
echo $
DOCKER_REGISTRY_PASSWORD | docker login --username thaliawww --password-stdin registry.hub.docker
.com
script
:
script
:
-
docker pull $DOCKER_TAG
-
docker pull $DOCKER_TAG
-
docker tag $DOCKER_TAG $DOCKER_TAG_PRODUCTION
-
docker tag $DOCKER_TAG $DOCKER_TAG_PRODUCTION
-
docker push $DOCKER_TAG_PRODUCTION
-
docker push $DOCKER_TAG_PRODUCTION
variables
:
variables
:
DOCKER_TAG
:
registry.
gitlab.com/thaliawww
/concrexit:$CI_COMMIT_SHA
DOCKER_TAG
:
registry.
hub.docker.com/thalia
/concrexit:$CI_COMMIT_SHA
DOCKER_TAG_PRODUCTION
:
registry.
gitlab.com/thaliawww
/concrexit:$CI_COMMIT_TAG
DOCKER_TAG_PRODUCTION
:
registry.
hub.docker.com/thalia
/concrexit:$CI_COMMIT_TAG
cache
:
cache
:
...
...
docker-compose.yml
View file @
5f7f5d92
...
@@ -8,7 +8,7 @@ services:
...
@@ -8,7 +8,7 @@ services:
environment
:
&postgresvars
environment
:
&postgresvars
POSTGRES_DB
:
thalia
POSTGRES_DB
:
thalia
web
:
web
:
image
:
registry.
gitlab.com/thaliawww
/concrexit
image
:
registry.
hub.docker.com/thalia
/concrexit
build
:
.
build
:
.
command
:
runserver 0.0.0.0:8000
command
:
runserver 0.0.0.0:8000
ports
:
ports
:
...
...
Write
Preview
Markdown
is supported
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