From 8f11979d6dce78de1ed53488d4ddeec32dd3bda3 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 17 Nov 2015 19:37:30 -0500 Subject: Revert "Bug 1222497 - Refactor the BMO docker image with new file and script structure while minimizing final image size" This reverts commit af46939af5dbe914e07c9b1ec0af2560b38ffbc6. --- docker/files/bugzilla.conf | 19 ----------------- docker/files/checksetup_answers.txt | 27 ------------------------ docker/files/my.cnf | 42 ------------------------------------- docker/files/rpm_list | 34 ------------------------------ docker/files/sudoers | 9 -------- docker/files/supervisord.conf | 25 ---------------------- 6 files changed, 156 deletions(-) delete mode 100644 docker/files/bugzilla.conf delete mode 100644 docker/files/checksetup_answers.txt delete mode 100644 docker/files/my.cnf delete mode 100644 docker/files/rpm_list delete mode 100644 docker/files/sudoers delete mode 100644 docker/files/supervisord.conf (limited to 'docker/files') diff --git a/docker/files/bugzilla.conf b/docker/files/bugzilla.conf deleted file mode 100644 index 857f79d17..000000000 --- a/docker/files/bugzilla.conf +++ /dev/null @@ -1,19 +0,0 @@ -User bugzilla -Group bugzilla -ServerName localhost:80 - -#PerlSwitches -wT -#PerlConfigRequire /home/bugzilla/devel/htdocs/bmo/mod_perl.pl - - - #AddHandler perl-script .cgi - AddHandler cgi-script .cgi - ServerName localhost - DocumentRoot "/home/bugzilla/devel/htdocs" - - DirectoryIndex index.cgi - Options Indexes FollowSymLinks ExecCGI - AllowOverride All - Require all granted - - diff --git a/docker/files/checksetup_answers.txt b/docker/files/checksetup_answers.txt deleted file mode 100644 index 0ab75aac9..000000000 --- a/docker/files/checksetup_answers.txt +++ /dev/null @@ -1,27 +0,0 @@ -$answer{'ADMIN_EMAIL'} = 'admin@mozilla.test'; -$answer{'ADMIN_OK'} = 'Y'; -$answer{'ADMIN_PASSWORD'} = 'password'; -$answer{'ADMIN_REALNAME'} = 'QA Admin'; -$answer{'NO_PAUSE'} = 1; -$answer{'bugzilla_version'} = '4.2'; -$answer{'create_htaccess'} = ''; -$answer{'cvsbin'} = '/usr/bin/cvs'; -$answer{'db_check'} = 1; -$answer{'db_driver'} = 'mysql'; -$answer{'db_host'} = 'localhost'; -$answer{'db_mysql_ssl_ca_file'} = ''; -$answer{'db_mysql_ssl_ca_path'} = ''; -$answer{'db_mysql_ssl_client_cert'} = ''; -$answer{'db_mysql_ssl_client_key'} = ''; -$answer{'db_name'} = 'bugs', -$answer{'db_pass'} = 'bugs'; -$answer{'db_port'} = 0; -$answer{'db_sock'} = ''; -$answer{'db_user'} = 'bugs'; -$answer{'diffpath'} = '/usr/bin'; -$answer{'index_html'} = 0; -$answer{'interdiffbin'} = '/usr/bin/interdiff'; -$answer{'memcached_servers'} = "localhost:11211"; -$answer{'urlbase'} = 'http://localhost/bmo/'; -$answer{'use_suexec'} = ''; -$answer{'webservergroup'} = 'bugzilla'; diff --git a/docker/files/my.cnf b/docker/files/my.cnf deleted file mode 100644 index b7e035ce5..000000000 --- a/docker/files/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -[mysql] -max_allowed_packet=1G - -[mysqld] -user = bugzilla -default_storage_engine = InnoDB -socket = /var/lib/mysql/mysql.sock -pid_file = /var/lib/mysql/mysql.pid -key_buffer_size = 32M -myisam_recover = FORCE,BACKUP -max_allowed_packet = 1G -max_connect_errors = 1000000 -innodb = FORCE -datadir = /var/lib/mysql -character-set-server = utf8mb4 -collation-server = utf8mb4_general_ci - -tmp_table_size = 32M -max_heap_table_size = 32M -query_cache_type = 0 -query_cache_size = 0 -max_connections = 500 -thread_cache_size = 50 -#open_files_limit = 65535 -table_definition_cache = 1024 -table_open_cache = 2048 - -innodb_flush_method = O_DIRECT -innodb_log_files_in_group = 2 -innodb_log_file_size = 256M -innodb_flush_log_at_trx_commit = 2 -innodb_file_per_table = 1 -innodb_buffer_pool_size = 1G -innodb_flush_neighbors = 0 -innodb_flush_log_at_trx_commit = 2 - -log_error = /var/lib/mysql/mysql-error.log -log_queries_not_using_indexes = 0 -slow_query_log = 0 -slow_query_log_file = /var/lib/mysql/mysql-slow.log -general_log = 0 -general_log_file = /var/lib/mysql/bmo_query.log diff --git a/docker/files/rpm_list b/docker/files/rpm_list deleted file mode 100644 index 3b155969b..000000000 --- a/docker/files/rpm_list +++ /dev/null @@ -1,34 +0,0 @@ -ImageMagick-perl -bzip2 -ctags -dbus-x11 -firefox -gcc -gcc-c++ -git -graphviz -java-1.7.0-openjdk -make -memcached -mod_perl -mod_perl-devel -mpfr-devel -mysql-community-server -openssl-devel -passwd -patch -patchutils -perl-App-cpanminus -perl-CPAN -perl-DBD-MySQL -perl-GD -perl-GSSAPI -perl-core -postfix -python-sphinx -sudo -supervisor -tigervnc-server-minimal -unzip -vim-enhanced -wget diff --git a/docker/files/sudoers b/docker/files/sudoers deleted file mode 100644 index afd139090..000000000 --- a/docker/files/sudoers +++ /dev/null @@ -1,9 +0,0 @@ -Defaults env_reset -Defaults env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR LS_COLORS" -Defaults env_keep += "MAIL PS1 PS2 QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE" -Defaults env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES" -Defaults env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE" -Defaults env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY" -Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin -root ALL=(ALL) ALL -%wheel ALL=(ALL) NOPASSWD: ALL diff --git a/docker/files/supervisord.conf b/docker/files/supervisord.conf deleted file mode 100644 index 4a3d49fcd..000000000 --- a/docker/files/supervisord.conf +++ /dev/null @@ -1,25 +0,0 @@ -[supervisord] -nodaemon=true -logfile=/var/log/supervisor/supervisord.log -logfile_maxbytes=50MB -logfile_backups=10 -loglevel=debug -pidfile=/var/run/supervisord.pid -minfds=1024 -minprocs=200 - -[program:httpd] -command=/usr/sbin/httpd -DFOREGROUND - -[program:mysqld] -command=/usr/bin/mysqld_safe - -[program:postfix] -command = /usr/sbin/postfix start -startsecs = 0 -autorestart = false - -[program:memcached] -command=/usr/bin/memcached -u memcached -stderr_logfile=/var/log/supervisor/memcached.log -stdout_logfile=/var/log/supervisor/memcached.log -- cgit v1.2.3-24-g4f1b