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
e6a9f504
Unverified
Commit
e6a9f504
authored
Jul 03, 2018
by
Michael Youngstrom
Committed by
GitHub
Jul 03, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4665 from edx/youngstrom/chown-plat
Chown edx-platform for jenkins-worker image
parents
2af7e659
8fa16302
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
docker.mk
+1
-1
docker/build/jenkins_worker/Dockerfile
+1
-2
util/parsefiles_config.yml
+1
-1
No files found.
docker.mk
View file @
e6a9f504
...
...
@@ -8,7 +8,7 @@ all_images:=$(patsubst docker/build/%/Dockerfile,%,$(dockerfiles))
# Used in the test.mk file as well.
images
:=
$
(
if
$(TRAVIS_COMMIT_RANGE)
,
$(
shell
git diff
--name-only
$(TRAVIS_COMMIT_RANGE)
| python util/parsefiles.py
)
,
$(all_images)
)
docker_build
=
docker.build.
docker_test
=
docker.test.
docker_pkg
=
docker.pkg.
...
...
docker/build/jenkins_worker/Dockerfile
View file @
e6a9f504
...
...
@@ -51,8 +51,7 @@ RUN mkdir /var/run/sshd \
&&
useradd
-ms
/bin/bash ubuntu
-g
ubuntu
-d
/home/ubuntu
\
&&
curl
${
JENKINS_WORKER_KEY_URL
}
--create-dirs
-o
/home/ubuntu/.ssh/authorized_keys
RUN
chown
-R
ubuntu /home/ubuntu
RUN
chown ubuntu /edx/app/edxapp/edx-platform
RUN
chown
-R
ubuntu /home/ubuntu /edx/app/edxapp/edx-platform
CMD
["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
EXPOSE
22
util/parsefiles_config.yml
View file @
e6a9f504
...
...
@@ -32,7 +32,7 @@ weights:
-
mongo
:
1
-
devpi
:
1
-
jenkins_build
:
8
-
jenkins_worker
:
2
2
-
jenkins_worker
:
2
3
-
analytics_pipeline
:
8
-
analytics_pipeline_hadoop_datanode
:
2
-
analytics_pipeline_hadoop_namenode
:
3
...
...
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