Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
configuration
Commits
55165f8d
Commit
55165f8d
authored
Jan 10, 2017
by
Feanil Patel
Committed by
GitHub
Jan 10, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3599 from edx/feanil/credentials-16.04
Feanil/credentials 16.04
parents
93182477
0c34bcab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
3 deletions
+17
-3
docker/build/credentials/Dockerfile
+1
-1
playbooks/roles/credentials/templates/edx/app/credentials/devstack.sh.j2
+16
-2
No files found.
docker/build/credentials/Dockerfile
View file @
55165f8d
...
...
@@ -7,7 +7,7 @@
# This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
# with the currently checked-out configuration repo.
FROM
edxops/
trusty
-common:latest
FROM
edxops/
xenial
-common:latest
MAINTAINER
edxops
ARG
CREDENTIALS_VERSION=master
...
...
playbooks/roles/credentials/templates/edx/app/credentials/devstack.sh.j2
View file @
55165f8d
...
...
@@ -11,11 +11,25 @@ case $COMMAND in
{{
supervisor_venv_bin
}}
/supervisord
--configuration
{{
supervisor_cfg
}}
# Needed to run bower as root. See explaination around 'discovery_user=root'
echo
'{ "allow_root": true }'
>
/root/.bowerrc
cd
/edx/app/edx_ansible/edx_ansible/docker/plays
/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook credentials.yml
-c
local
-i
'127.0.0.1,'
\
-t
'install:app-requirements,assets:gather,devstack,migrate
,manage:start
'
\
-t
'install:app-requirements,assets:gather,devstack,migrate'
\
--extra-vars
=
"migrate_db=yes"
\
--extra-vars
=
"@/ansible_overrides.yml"
--extra-vars
=
"@/ansible_overrides.yml"
\
--extra-vars
=
"credentials_user=root"
# Needed when sharing the volume with the host machine because node/bower drops
# everything in the code directory by default. So we get issues with permissions
# on folders owned by the developer.
# Need to start supervisord and nginx manually because systemd is hard to run on docker
# http://developers.redhat.com/blog/2014/05/05/running-systemd-within-docker-container/
# Both daemon by default
nginx
/edx/app/supervisor/venvs/supervisor/bin/supervisord
--configuration
/edx/app/supervisor/supervisord.conf
# Docker requires an active foreground task. Tail the logs to appease Docker and
# provide useful output for development.
...
...
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