diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-11-18 01:36:30 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-11-18 01:41:18 +0100 |
| commit | bd1cd98f4bb655e4fa8c83aa7126d0c0f84bf53b (patch) | |
| tree | 9cdf965281ecb5b4e934eb90336b35fad182fe99 | |
| parent | e4f8e12a1696598f22513d1f4a94b5aa2a4b348a (diff) | |
| download | bugzilla-bd1cd98f4bb655e4fa8c83aa7126d0c0f84bf53b.tar.gz bugzilla-bd1cd98f4bb655e4fa8c83aa7126d0c0f84bf53b.tar.xz | |
Revert "Bug 1222497 - Refactor the BMO docker image with new file and script structure while minimizing final image size"
This reverts commit a0e7a4ffa25957c994fd0128a3f613758fefcd75.
| -rw-r--r-- | Bugzilla/Install/Filesystem.pm | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | docker/docker-compose.yml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/scripts/buildbot_step | 0 | ||||
| -rwxr-xr-x | docker/scripts/start.sh | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/bugzilla-queue.rhel | 0 |
5 files changed, 10 insertions, 3 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 0eab0337c..addad918b 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -175,9 +175,8 @@ sub FILESYSTEM { 'cvs-update.log' => { perms => WS_SERVE }, 'scripts/sendunsentbugmail.pl' => { perms => WS_EXECUTE }, 'docker/*' => { perms => OWNER_WRITE }, - 'docker/files/*' => { perms => OWNER_WRITE }, - 'docker/scripts/*.pl' => { perms => OWNER_EXECUTE }, - 'docker/scripts/*.sh' => { perms => OWNER_EXECUTE }, + 'docker/*.pl' => { perms => OWNER_EXECUTE }, + 'docker/*.sh' => { perms => OWNER_EXECUTE }, 'docs/bugzilla.ent' => { perms => OWNER_WRITE }, 'docs/makedocs.pl' => { perms => OWNER_EXECUTE }, 'docs/style.css' => { perms => WS_SERVE }, diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e6e9ac8fd..e6e9ac8fd 100644..100755 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml diff --git a/docker/scripts/buildbot_step b/docker/scripts/buildbot_step index a567351b8..a567351b8 100755..100644 --- a/docker/scripts/buildbot_step +++ b/docker/scripts/buildbot_step diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh new file mode 100755 index 000000000..077870166 --- /dev/null +++ b/docker/scripts/start.sh @@ -0,0 +1,8 @@ +docker run -d \ + --name dkl_bugzilla_1 \ + --hostname dkl_bugzilla_1 \ + --publish 80:80 \ + --publish 2222:22 \ + --volume /home/dkl/devel:/home/bugzilla/devel \ + --volume /home/dkl/data/bzdev/mysql:/var/lib/mysql \ + dkl_bugzilla diff --git a/scripts/bugzilla-queue.rhel b/scripts/bugzilla-queue.rhel index dd7a2c664..dd7a2c664 100755..100644 --- a/scripts/bugzilla-queue.rhel +++ b/scripts/bugzilla-queue.rhel |