Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
RECIRCLE
/
portal
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
11
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
1379563b
authored
Jul 17, 2020
by
Chif Gergő
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set settings module based on which dockerfile runs
parent
fcf5abcf
Pipeline
#1279
passed with stages
in 4 minutes 41 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
1 deletions
+3
-1
.gitlab-ci.yml
+1
-0
Dockerfile
+1
-0
Dockerfile.prod
+1
-0
setup_ci_env.sh
+0
-1
No files found.
.gitlab-ci.yml
View file @
1379563b
...
...
@@ -38,6 +38,7 @@ deploy_staging:
git checkout DEV &&
git submodule update --init --recursive &&
chmod +x ./setup_ci_env.sh && ./setup_ci_env.sh &&
echo DJANGO_SETTINGS_MODULE=recircle.settings.prod >> .env &&
docker-compose -f docker-compose.prod.yml up -d --build &&
exit
environment
:
...
...
Dockerfile
View file @
1379563b
...
...
@@ -9,6 +9,7 @@ EXPOSE 8000/tcp
COPY
Pipfile* .env ./
# This env variable needed to pipenv find .env file
ENV
PIPENV_DOTENV_LOCATION=/usr/cloud/portal/.env
ENV
DJANGO_SETTINGS_MODULE=recircle.settings.local
# Install dependencies
RUN
pipenv install
-d
# Copy sources
...
...
Dockerfile.prod
View file @
1379563b
...
...
@@ -9,6 +9,7 @@ EXPOSE 8000/tcp
COPY Pipfile* .env ./
# This env variable needed to pipenv find .env file
ENV PIPENV_DOTENV_LOCATION=/usr/cloud/portal/.env
ENV DJANGO_SETTINGS_MODULE=recircle.settings.prod
# Install dependencies
RUN pipenv install
# Copy sources
...
...
setup_ci_env.sh
View file @
1379563b
...
...
@@ -5,7 +5,6 @@
# And by the Django runtime
# Django configuration
echo
DJANGO_SECRET
=
${
DJANGO_SECRET
}
>>
.env
echo
DJANGO_SETTINGS_MODULE
=
${
DJANGO_SETTINGS_MODULE
}
>>
.env
# If using other database than sqlite3 (only use sqlite for development!)
# Provide the db credentials here
echo
DATABASE_PASSWORD
=
${
DATABASE_PASSWORD
}
>>
.env
...
...
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