Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rosetta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
ExaCT
Rosetta
Commits
d0b8e8b5
Commit
d0b8e8b5
authored
4 years ago
by
Stefano Alberto Russo
Browse files
Options
Downloads
Patches
Plain Diff
Minor cleanup.
parent
3cf017cf
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
services/base/Dockerfile
+2
-2
2 additions, 2 deletions
services/base/Dockerfile
services/webapp/Dockerfile
+4
-4
4 additions, 4 deletions
services/webapp/Dockerfile
services/webapp/run_webapp.sh
+3
-3
3 additions, 3 deletions
services/webapp/run_webapp.sh
with
9 additions
and
9 deletions
services/base/Dockerfile
+
2
−
2
View file @
d0b8e8b5
...
@@ -60,10 +60,10 @@ RUN echo "source /env.sh" > /rosetta/.bash_profile
...
@@ -60,10 +60,10 @@ RUN echo "source /env.sh" > /rosetta/.bash_profile
#------------------------
#------------------------
# Create dirs
# Create dirs
RUN
mkdir
/data
&&
mkdir
/opt/rosetta
&&
mkdir
/var/log/rosetta
RUN
mkdir
/data
&&
mkdir
/var/log/rosetta
# Give right permissions
# Give right permissions
RUN
chown
-R
rosetta:rosetta /data
&&
chown
-R
rosetta:rosetta
/opt/rosetta
&&
chown
-R
rosetta:rosetta
/var/log/rosetta
RUN
chown
-R
rosetta:rosetta /data
&&
chown
-R
rosetta:rosetta /var/log/rosetta
#----------------------
#----------------------
...
...
This diff is collapsed.
Click to expand it.
services/webapp/Dockerfile
+
4
−
4
View file @
d0b8e8b5
...
@@ -45,20 +45,20 @@ RUN apt-get install docker.io -y
...
@@ -45,20 +45,20 @@ RUN apt-get install docker.io -y
#------------------------------
#------------------------------
# Prepare dir
# Prepare dir
RUN
mkdir
/opt/
webapp_
code
RUN
mkdir
/opt/code
# Install Python requirements..
# Install Python requirements..
COPY
requirements.txt /tmp/
COPY
requirements.txt /tmp/
RUN
cd
/opt/
webapp_
code
&&
pip3
install
-r
/tmp/requirements.txt
RUN
cd
/opt/code
&&
pip3
install
-r
/tmp/requirements.txt
# Patch Django 2.2 non-ascii chars in /usr/local/lib/python3.6/dist-packages/django/views/templates/technical_500.html
# Patch Django 2.2 non-ascii chars in /usr/local/lib/python3.6/dist-packages/django/views/templates/technical_500.html
RUN
sed
-i
's/[\x80-\xFF]/./g'
/usr/local/lib/python3.6/dist-packages/django/views/templates/technical_500.html
RUN
sed
-i
's/[\x80-\xFF]/./g'
/usr/local/lib/python3.6/dist-packages/django/views/templates/technical_500.html
# Install App code
# Install App code
COPY
code /opt/
webapp_
code
COPY
code /opt/code
# Fix permissions
# Fix permissions
RUN
chown
-R
rosetta:rosetta /opt/
webapp_
code
RUN
chown
-R
rosetta:rosetta /opt/code
# Copy db conf
# Copy db conf
COPY
db_conf.sh /db_conf.sh
COPY
db_conf.sh /db_conf.sh
...
...
This diff is collapsed.
Click to expand it.
services/webapp/run_webapp.sh
+
3
−
3
View file @
d0b8e8b5
...
@@ -47,7 +47,7 @@ export PYTHONUNBUFFERED=on
...
@@ -47,7 +47,7 @@ export PYTHONUNBUFFERED=on
# Check if there is something to migrate or populate
# Check if there is something to migrate or populate
echo
""
echo
""
echo
"2) Making migrations..."
echo
"2) Making migrations..."
cd
/opt/
webapp_
code
&&
$DJANGO_PYTHON
manage.py makemigrations
--noinput
cd
/opt/code
&&
$DJANGO_PYTHON
manage.py makemigrations
--noinput
EXIT_CODE
=
$?
EXIT_CODE
=
$?
echo
"Exit code:
$EXIT_CODE
"
echo
"Exit code:
$EXIT_CODE
"
if
[[
"x
$EXIT_CODE
"
!=
"x0"
]]
;
then
if
[[
"x
$EXIT_CODE
"
!=
"x0"
]]
;
then
...
@@ -58,7 +58,7 @@ fi
...
@@ -58,7 +58,7 @@ fi
echo
""
echo
""
echo
"3) Migrating..."
echo
"3) Migrating..."
cd
/opt/
webapp_
code
&&
$DJANGO_PYTHON
manage.py migrate
--noinput
cd
/opt/code
&&
$DJANGO_PYTHON
manage.py migrate
--noinput
EXIT_CODE
=
$?
EXIT_CODE
=
$?
echo
"Exit code:
$EXIT_CODE
"
echo
"Exit code:
$EXIT_CODE
"
if
[[
"x
$EXIT_CODE
"
!=
"x0"
]]
;
then
if
[[
"x
$EXIT_CODE
"
!=
"x0"
]]
;
then
...
@@ -69,7 +69,7 @@ fi
...
@@ -69,7 +69,7 @@ fi
echo
""
echo
""
echo
"4) Populating core app..."
echo
"4) Populating core app..."
cd
/opt/
webapp_
code
&&
$DJANGO_PYTHON
manage.py core_app_populate
cd
/opt/code
&&
$DJANGO_PYTHON
manage.py core_app_populate
EXIT_CODE
=
$?
EXIT_CODE
=
$?
echo
"Exit code:
$EXIT_CODE
"
echo
"Exit code:
$EXIT_CODE
"
if
[[
"x
$EXIT_CODE
"
!=
"x0"
]]
;
then
if
[[
"x
$EXIT_CODE
"
!=
"x0"
]]
;
then
...
...
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