From a0e7a4ffa25957c994fd0128a3f613758fefcd75 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 10 Nov 2015 20:54:06 +0000 Subject: Bug 1222497 - Refactor the BMO docker image with new file and script structure while minimizing final image size --- Bugzilla/Install/Filesystem.pm | 5 +++-- docker/docker-compose.yml | 0 docker/scripts/buildbot_step | 0 docker/scripts/start.sh | 8 -------- scripts/bugzilla-queue.rhel | 0 5 files changed, 3 insertions(+), 10 deletions(-) mode change 100755 => 100644 docker/docker-compose.yml mode change 100644 => 100755 docker/scripts/buildbot_step delete mode 100755 docker/scripts/start.sh mode change 100644 => 100755 scripts/bugzilla-queue.rhel diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index addad918b..0eab0337c 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -175,8 +175,9 @@ sub FILESYSTEM { 'cvs-update.log' => { perms => WS_SERVE }, 'scripts/sendunsentbugmail.pl' => { perms => WS_EXECUTE }, 'docker/*' => { perms => OWNER_WRITE }, - 'docker/*.pl' => { perms => OWNER_EXECUTE }, - 'docker/*.sh' => { perms => OWNER_EXECUTE }, + 'docker/files/*' => { perms => OWNER_WRITE }, + 'docker/scripts/*.pl' => { perms => OWNER_EXECUTE }, + 'docker/scripts/*.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 old mode 100755 new mode 100644 diff --git a/docker/scripts/buildbot_step b/docker/scripts/buildbot_step old mode 100644 new mode 100755 diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh deleted file mode 100755 index 077870166..000000000 --- a/docker/scripts/start.sh +++ /dev/null @@ -1,8 +0,0 @@ -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 old mode 100644 new mode 100755 -- cgit v1.2.3-24-g4f1b