Skip to content

Pull request setting user directory #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Pull request setting user directory #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8b8fbab
Added sudo, bash, latex, dvipng to 'dependencies'
mccartney Mar 5, 2016
f303f6a
Adding support for custom certificate to be added to Java CA certs
Oct 28, 2016
1ce49d8
Switching the dependent docker image from 'java' to 'openjdk'
Oct 31, 2016
2667c15
Merge pull request #1 from mccartney/switching-from-java-to-openjdk
mccartney Oct 31, 2016
fa65dd9
Setting daemon's home directory
mccartney Dec 2, 2016
08b4cfe
Setting daemon's home directory
mccartney Dec 2, 2016
96266b6
Merge branch 'master' of github.com:mccartney/docker-atlassian-conflu…
mccartney Dec 3, 2016
24c8429
Merge branch 'master' of github.com:mccartney/docker-atlassian-conflu…
mccartney Dec 3, 2016
690c40d
Manual merge
mccartney Dec 3, 2016
594fe8e
Fixes upstream 40
mccartney Dec 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ RUN set -x \
--delete "Server/Service/Engine/Host/Context/@debug" \
"${CONF_INSTALL}/conf/server.xml" \
&& touch -d "@0" "${CONF_INSTALL}/conf/server.xml" \
&& chown daemon:daemon "${JAVA_CACERTS}"
&& chown daemon:daemon "${JAVA_CACERTS}" \
&& usermod -d "${CONF_HOME}" daemon

# Use the default unprivileged account. This could be considered bad practice
# on systems where multiple processes end up being executed by 'daemon' but
Expand Down
1 change: 0 additions & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ if [ -f "${CERTIFICATE}" ]; then
keytool -noprompt -storepass changeit -keystore ${JAVA_CACERTS} -import -file ${CERTIFICATE} -alias CompanyCA
fi


exec "$@"