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
5803dac0
Commit
5803dac0
authored
Jan 04, 2016
by
Edward Zarecor
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2647 from edx/e0d/fix-analytics_api
E0d/fix analytics api
parents
b0e6ede0
19c9a6be
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
26 deletions
+16
-26
docker/build/analytics_api/Dockerfile
+14
-0
docker/build/analytics_api/xDockerfile
+0
-24
playbooks/roles/analytics_api/tasks/main.yml
+2
-2
No files found.
docker/build/analytics_api/Dockerfile
0 → 100644
View file @
5803dac0
FROM
edxops/precise-common:latest
MAINTAINER
edxops
RUN
apt-get update
ADD
. /edx/app/edx_ansible/edx_ansible
COPY
docker/build/analytics_api/ansible_overrides.yml /
WORKDIR
/edx/app/edx_ansible/edx_ansible/docker/plays
COPY
docker/build/analytics_api/ansible_overrides.yml /
RUN
/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook analytics_api.yml
-i
'127.0.0.1,'
-c
local
-t
"install:base,install:system-requirements,install:configuration,install:app-requirements,install:code"
-e
@/ansible_overrides.yml
WORKDIR
/edx/app/
CMD
["/edx/app/supervisor/venvs/supervisor/bin/supervisord -n --configuration /edx/app/supervisor/supervisord.conf"]
EXPOSE
443 80
docker/build/analytics_api/xDockerfile
deleted
100644 → 0
View file @
b0e6ede0
FROM edxops/precise-common:latest
MAINTAINER edxops
ENV CONFIGURATION_REPO="https://github.com/edx/configuration.git"
ENV CONFIGURATION_VERSION="hack2015/docker"
USER docker
RUN sudo apt-get update
WORKDIR /edx/app/edx_ansible/edx_ansible
RUN sudo git fetch --all
RUN sudo git checkout ${CONFIGURATION_VERSION}
RUN sudo git reset --hard origin/${CONFIGURATION_VERSION}
RUN sudo git pull
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY ansible_overrides.yml /
# Remove when branch is pushed
COPY analytics_api-temp.yml /edx/app/edx_ansible/edx_ansible/docker/plays/analytics_api.yml
RUN sudo ansible-playbook analytics_api.yml -i '127.0.0.1,' -c local -t "install:base,install:system-requirements,install:configuration,install:app-requirements,install:code" -e@/ansible_overrides.yml
CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord -n --configuration /edx/app/supervisor/supervisord.conf"]
EXPOSE 443 80
playbooks/roles/analytics_api/tasks/main.yml
View file @
5803dac0
...
...
@@ -130,8 +130,8 @@
shell
:
"
{{
supervisor_ctl
}}
-c
{{
supervisor_cfg
}}
update"
when
:
not disable_edx_services
tags
:
-
install
-
install:configuration
-
manage
-
manage:start
-
name
:
create symlinks from the venv bin dir
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