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
254db17a
Commit
254db17a
authored
Dec 29, 2015
by
Edward Zarecor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
various build fixes
parent
60507742
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
25 deletions
+16
-25
.dockerignore
+1
-0
docker/build/xqueue/Dockerfile
+13
-0
docker/build/xqueue/xDockerfile
+0
-23
playbooks/roles/xqueue/tasks/deploy.yml
+2
-2
No files found.
.dockerignore
View file @
254db17a
*
!playbooks/
!docker/build/*/ansible_overrides.yml
!docker/build/*/*.sh
!docker/plays/
!util/install/
docker/build/xqueue/Dockerfile
0 → 100644
View file @
254db17a
FROM
edxops/precise-common:latest
MAINTAINER
edxops
USER
root
RUN
apt-get update
ADD
. /edx/app/edx_ansible/edx_ansible
COPY
docker/build/xqueue/ansible_overrides.yml /
WORKDIR
/edx/app/edx_ansible/edx_ansible/docker/plays
RUN
/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook xqueue.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
COPY
docker/build/xqueue/docker-run.sh /
ENTRYPOINT
["/docker-run.sh"]
EXPOSE
8110 18110
docker/build/xqueue/xDockerfile
deleted
100644 → 0
View file @
60507742
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 /
RUN sudo ansible-playbook xqueue.yml -i '127.0.0.1,' -c local -t "install:base,install:system-requirements,install:configuration,install:application-requirements,install:code" -e@/ansible_overrides.yml
USER root
COPY docker-run.sh /
ENTRYPOINT ["/docker-run.sh"]
EXPOSE 8110 18110
playbooks/roles/xqueue/tasks/deploy.yml
View file @
254db17a
...
...
@@ -71,7 +71,7 @@
-
restart xqueue
tags
:
-
install
-
install:app
lication
-requirements
-
install:app-requirements
# Install the python post requirements into {{ xqueue_venv_dir }}
-
name
:
install python post-requirements
...
...
@@ -83,7 +83,7 @@
-
restart xqueue
tags
:
-
install
-
install:app
lication
-requirements
-
install:app-requirements
# If there is a common user for migrations run migrations using his username
# and credentials. If not we use the xqueue mysql user
...
...
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