2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/88d434f15cd4/ Changeset: 88d434f15cd4 User: BjoernGruening Date: 2014-11-28 19:18:58+00:00 Summary: Update the Dockerfile template to the latest version our Galaxy Docker Container. The new container will be release together with Galaxy next week. Affected #: 1 file
diff -r 3975b317ffdcbaa6c8dcb4b2b52404bfa34edbc2 -r 88d434f15cd4042df6b4fb22c9861cbd42bb2a77 lib/tool_shed/util/basic_util.py --- a/lib/tool_shed/util/basic_util.py +++ b/lib/tool_shed/util/basic_util.py @@ -27,24 +27,25 @@
MAINTAINER Bjoern A. Gruning, bjoern.gruening@gmail.com
-RUN sed -i 's|brand.*|brand = deepTools|g' ~/galaxy-central/universe_wsgi.ini - WORKDIR /galaxy-central
${selected_repositories}
-# Mark one folder as imported from the host. -VOLUME ["/export/"] +# Mark folders as imported from the host. +VOLUME ["/export/", "/data/", "/var/lib/docker"]
-# Expose port 80 to the host +# Expose port 80 (webserver), 21 (FTP server), 8800 (Proxy), 9001 (Galaxy report app) EXPOSE :80 +EXPOSE :21 +EXPOSE :8800 +EXPOSE :9001
# Autostart script that is invoked during container start CMD ["/usr/bin/startup"] '''
SELECTED_REPOSITORIES_TEMPLATE = ''' -RUN service postgresql start && service apache2 start && ./run.sh --daemon && sleep 120 && python ./scripts/api/install_tool_shed_repositories.py --api admin -l http://localhost:8080 --url ${tool_shed_url} -o ${repository_owner} --name ${repository_name} --tool-deps --repository-deps --panel-section-name 'Docker' +RUN install-repository "--url ${tool_shed_url} -o ${repository_owner} --name ${repository_name}" '''
def evaluate_template( text, install_environment ):
https://bitbucket.org/galaxy/galaxy-central/commits/82b95de1f7bd/ Changeset: 82b95de1f7bd User: dannon Date: 2014-12-02 13:26:09+00:00 Summary: Merged in BjoernGruening/galaxy-central-1 (pull request #578)
Update the Dockerfile template to the latest version our Galaxy Docker Container. Affected #: 1 file
diff -r 74e82c604d026307fa8d72a7850ddd33c5f9259b -r 82b95de1f7bd2db44900c2d85c14dc49fa683502 lib/tool_shed/util/basic_util.py --- a/lib/tool_shed/util/basic_util.py +++ b/lib/tool_shed/util/basic_util.py @@ -27,24 +27,25 @@
MAINTAINER Bjoern A. Gruning, bjoern.gruening@gmail.com
-RUN sed -i 's|brand.*|brand = deepTools|g' ~/galaxy-central/universe_wsgi.ini - WORKDIR /galaxy-central
${selected_repositories}
-# Mark one folder as imported from the host. -VOLUME ["/export/"] +# Mark folders as imported from the host. +VOLUME ["/export/", "/data/", "/var/lib/docker"]
-# Expose port 80 to the host +# Expose port 80 (webserver), 21 (FTP server), 8800 (Proxy), 9001 (Galaxy report app) EXPOSE :80 +EXPOSE :21 +EXPOSE :8800 +EXPOSE :9001
# Autostart script that is invoked during container start CMD ["/usr/bin/startup"] '''
SELECTED_REPOSITORIES_TEMPLATE = ''' -RUN service postgresql start && service apache2 start && ./run.sh --daemon && sleep 120 && python ./scripts/api/install_tool_shed_repositories.py --api admin -l http://localhost:8080 --url ${tool_shed_url} -o ${repository_owner} --name ${repository_name} --tool-deps --repository-deps --panel-section-name 'Docker' +RUN install-repository "--url ${tool_shed_url} -o ${repository_owner} --name ${repository_name}" '''
def evaluate_template( text, install_environment ):
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
galaxy-commits@lists.galaxyproject.org