diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-11-18 01:36:09 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-11-18 01:41:18 +0100 |
| commit | e4f8e12a1696598f22513d1f4a94b5aa2a4b348a (patch) | |
| tree | 0f88706defe95ee7fcf2c84f9c745ae09bb7545f /docker/Dockerfile | |
| parent | f75de36e911ac72b3325e1074a627f067cc61fd1 (diff) | |
| download | bugzilla-e4f8e12a1696598f22513d1f4a94b5aa2a4b348a.tar.gz bugzilla-e4f8e12a1696598f22513d1f4a94b5aa2a4b348a.tar.xz | |
Revert "Bug 1224649 - Docker and QA scripts should just use the same checksetup_answers.txt file"
This reverts commit 27dac6e9b0d2df69037cd022e77a9bf356fc7a67.
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b5464761e..ebba20a48 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,3 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This Source Code Form is "Incompatible With Secondary Licenses", as -# defined by the Mozilla Public License, v. 2.0. - FROM centos:centos7 MAINTAINER David Lawrence <dkl@mozilla.com> @@ -15,8 +8,9 @@ ENV BUGZILLA_ROOT $HOME/devel/htdocs/bmo ENV GITHUB_BASE_GIT https://github.com/mozilla/webtools-bmo-bugzilla ENV GITHUB_BASE_BRANCH master -# Copy over configuration files +# Copy over all files and scripts COPY files /files +COPY scripts /scripts # Distribution package installation RUN yum -y -q install https://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm epel-release \ @@ -48,7 +42,6 @@ RUN cp /files/sudoers /etc/sudoers \ RUN su $BUGZILLA_USER -c "git clone $GITHUB_BASE_GIT -b $GITHUB_BASE_BRANCH $BUGZILLA_ROOT" # Bugzilla dependencies and setup -COPY scripts /scripts RUN chmod a+x /scripts/* RUN /scripts/install_deps.sh RUN /scripts/bugzilla_config.sh |