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
edx
configuration
Commits
6ff119cb
Commit
6ff119cb
authored
May 31, 2017
by
Andy Armstrong
Committed by
John Eskew
Jun 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support development requirements in Vagrant and Docker devstacks
parent
436e26f7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
5 deletions
+29
-5
.dockerignore
+1
-1
CHANGELOG.md
+3
-0
docker/build/edxapp/Dockerfile
+3
-1
docker/build/edxapp/devstack.yml
+17
-0
playbooks/roles/edxapp/vars/devstack.yml
+5
-3
No files found.
.dockerignore
View file @
6ff119cb
*
!playbooks/
!docker/build/*/ansible_overrides.yml
!docker/build/*
!docker/build/*/*.yml
docker/build/*/Dockerfile
!docker/plays/
!util/install/
CHANGELOG.md
View file @
6ff119cb
-
Role: edxapp
-
Install development.txt in Vagrant and Docker devstacks
-
Role: edxapp
-
Set the EDXAPP_IMPORT_EXPORT_BUCKET setting to an empty string
-
Role: edxapp
...
...
docker/build/edxapp/Dockerfile
View file @
6ff119cb
...
...
@@ -18,6 +18,7 @@ ADD . /edx/app/edx_ansible/edx_ansible
WORKDIR
/edx/app/edx_ansible/edx_ansible/docker/plays
COPY
docker/build/edxapp/ansible_overrides.yml /
COPY
docker/build/edxapp/devstack.yml /
ARG
OPENEDX_RELEASE=master
ENV
OPENEDX_RELEASE=${OPENEDX_RELEASE}
...
...
@@ -25,6 +26,7 @@ RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook edxapp.yml
-c
local
-i
'127.0.0.1,'
\
-t
'install,assets,devstack'
\
--extra-vars
=
edx_platform_version
=
${
OPENEDX_RELEASE
}
\
--extra-vars
=
"@/ansible_overrides.yml"
--extra-vars
=
"@/ansible_overrides.yml"
\
--extra-vars
=
"@/devstack.yml"
EXPOSE
18000 18010
docker/build/edxapp/devstack.yml
0 → 100644
View file @
6ff119cb
---
# The only difference between these requirements and the role defaults is the
# presence of the "development.txt" and "testing.txt" files. These two sets
# of requirements should not be used in production.
development_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/development.txt"
testing_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/testing.txt"
edxapp_requirements_files
:
-
"
{{
pre_requirements_file
}}"
-
"
{{
github_requirements_file
}}"
-
"
{{
custom_requirements_file
}}"
-
"
{{
local_requirements_file
}}"
-
"
{{
base_requirements_file
}}"
-
"
{{
post_requirements_file
}}"
-
"
{{
paver_requirements_file
}}"
-
"
{{
development_requirements_file
}}"
-
"
{{
testing_requirements_file
}}"
playbooks/roles/edxapp/vars/devstack.yml
View file @
6ff119cb
---
#
Currently the only difference between these requierements and the rol
e
#
defaults is the presence of the "testing.txt" file, which is used to install
#
packages not used in production
#
The only difference between these requirements and the role defaults is th
e
#
presence of the "development.txt" and "testing.txt" files. These two sets
#
of requirements should not be used in production.
pre_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/pre.txt"
github_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/github.txt"
custom_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/custom.txt"
...
...
@@ -9,6 +9,7 @@ local_requirements_file: "{{ edxapp_code_dir }}/requirements/edx/local.txt"
base_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/base.txt"
post_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/post.txt"
paver_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/paver.txt"
development_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/development.txt"
testing_requirements_file
:
"
{{
edxapp_code_dir
}}/requirements/edx/testing.txt"
edxapp_requirements_files
:
...
...
@@ -19,4 +20,5 @@ edxapp_requirements_files:
-
"
{{
base_requirements_file
}}"
-
"
{{
post_requirements_file
}}"
-
"
{{
paver_requirements_file
}}"
-
"
{{
development_requirements_file
}}"
-
"
{{
testing_requirements_file
}}"
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