Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tdt4242-base
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
Rolf Erik Sesseng Aas
tdt4242-base
Commits
b6408e8b
Commit
b6408e8b
authored
3 years ago
by
Sigurd Røstad Augdal
Browse files
Options
Downloads
Patches
Plain Diff
Update .gitlab-ci.yml, docker-compose.yml files - second try.
parent
f447e43a
No related branches found
No related tags found
No related merge requests found
Pipeline
#118625
passed with stages
in 5 minutes and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-4
2 additions, 4 deletions
.gitlab-ci.yml
docker-compose.yml
+0
-1
0 additions, 1 deletion
docker-compose.yml
with
2 additions
and
5 deletions
.gitlab-ci.yml
+
2
−
4
View file @
b6408e8b
...
...
@@ -60,7 +60,6 @@ deploy-stage:
only
:
-
develop
stage
:
deploy
--skip-cleanup
:
true
before_script
:
-
apt-get update -qy
-
apt-get install -y ruby-dev
...
...
@@ -68,14 +67,13 @@ deploy-stage:
script
:
-
echo "Deploying to Heroku stage"
-
dpl --provider=heroku --app=$HEROKU_FRONTEND_APP_STAGE --api-key=$HEROKU_API_KEY
-
dpl --provider=heroku --app=$HEROKU_BACKEND_APP_STAGE --api-key=$HEROKU_API_KEY
-
dpl --provider=heroku --app=$HEROKU_BACKEND_APP_STAGE --api-key=$HEROKU_API_KEY
--skip-cleanup=true
deploy-prod
:
image
:
ruby:latest
only
:
-
master
stage
:
deploy
--skip-cleanup
:
true
before_script
:
-
apt-get update -qy
-
apt-get install -y ruby-dev
...
...
@@ -83,5 +81,5 @@ deploy-prod:
script
:
-
echo "Deploying to Heroku production"
-
dpl --provider=heroku --app=$HEROKU_FRONTEND_APP_PRODUCTION --api-key=$HEROKU_API_KEY
-
dpl --provider=heroku --app=$HEROKU_BACKEND_APP_PRODUCTION --api-key=$HEROKU_API_KEY
-
dpl --provider=heroku --app=$HEROKU_BACKEND_APP_PRODUCTION --api-key=$HEROKU_API_KEY
--skip-cleanup=true
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
0
−
1
View file @
b6408e8b
...
...
@@ -6,7 +6,6 @@ services:
build
:
context
:
backend/secfit/
dockerfile
:
Dockerfile
skip_cleanup
:
true
args
:
DJANGO_SUPERUSER_USERNAME
:
"
${DJANGO_SUPERUSER_USERNAME}"
DJANGO_SUPERUSER_PASSWORD
:
"
${DJANGO_SUPERUSER_PASSWORD}"
...
...
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