Pull upstream work into your branch - which is behind upstream

.dockerignore

@@ -0,0 +1,21 @@
+.idea
+
+.gitattributes
+.gitignore
+.git
+
+.dockerignore
+Dockerfile
+docker-compose.yml
+
+LICENSE.md
+README.md
+
+storage.json
+
+/vendor
+nbproject/
+
+.vagrant
+vagrant
+Vagrantfile

.gitignore

@@ -1,4 +1,5 @@
 .idea
 /vendor
 .vagrant
-nbproject/
+nbproject/
+config.local.php

Dockerfile

@@ -0,0 +1,16 @@
+FROM php:8.4-apache
+LABEL maintainer="Rion Dooley <dooley@tacc.utexas.edu>"
+
+ENV APACHE_DOCROOT="/var/www"
+
+# Add custom default apache virtual host with combined error and access logging to stdout
+COPY docker/apache_vhost /etc/apache2/sites-available/000-default.conf
+COPY docker/php.ini /usr/local/etc/php
+
+# Add custom entrypoint to inject runtime environment variables into beanstalk console config
+COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+RUN chmod +x /usr/local/bin/docker-entrypoint
+CMD ["/usr/local/bin/docker-entrypoint"]
+
+WORKDIR "${APACHE_DOCROOT}"
+COPY . ./

README.md

@@ -8,20 +8,25 @@
 
 **Features**
 
-- Common list of servers in config for all users
+- Common list of servers in config for all users + optional Basic Auth
+- Global server list can be set via BEANSTALK_SERVERS environment variable
 - Each user can add its own personal Beanstalkd server
-- Full list of available tubes
 - Complete statistics about jobs in tubes
 - Realtime auto-update with highlighting of changed values
-- You can view jobs in ready/delayed/buried states in every tube
-- You can add/kick/delete jobs in every tube
-- You can select multiple tubes by regExp and clear them
-- You can move jobs between tubes
-- Ability to Pause tubes
-- Saved jobs (store sample jobs as a template, kick/edit them, very useful for development)
-- Customizable UI (code highlighter, choose columns, edit auto refresh seconds, pause tube seconds)
+- View jobs in ready/delayed/buried states in every tube
+- Highlighting of buried jobs for better visibility
+- Add/kick/delete jobs in every tube
+- Select multiple tubes by regular expression and clear them
+- Saved jobs: Store sample jobs as templates, kick/edit them (useful for development)
+- Search within job data fields
+- Move jobs between tubes
+- Pause tubes
+- Configurable UI settings (auto-refresh, decoding, pause duration, etc.)
+
+**Change log**
+
+Navigate to [Releases](https://github.com/ptrofimov/beanstalk_console/releases).
 
-Change log on [Releases](https://github.com/ptrofimov/beanstalk_console/releases).
 
 **Installation**
 
@@ -37,50 +42,42 @@ Then, use the `create-project` command to generate a new application:
 
 Composer will install the Beanstalk Console and all its dependencies under the `path/to/install` directory.
 
-### Setup using vagrant
-
-Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) and [vagrant](http://www.vagrantup.com/downloads.html) then run (from project root):
-
-    vagrant up
-
-After provision beanstalk console will be available at [http://localhost:7654](http://localhost:7654) (port could be configured in Vagrantfile)
-
-### Download an Archive File
+### Run as a Docker container
 
-[Download](https://github.com/ptrofimov/beanstalk_console/archive/master.zip), unzip files to your *wwww* directory and launch from *public* directory, enjoy!
+Install [Docker](https://docs.docker.com/installation/) then build and run with the following command (from project root):
 
+    docker build --rm -t beanstalk_console .
+    docker run -d -p "80:80" --name beanstalk_console beanstalk_console
 
-**Authors:** Petr Trofimov, Sergey Lysenko, Pentium10
+If you would rather just run the existing automated build of this project, run (from project root):
 
---------------------------------------------------
+    docker run -d -p "80:80" -e APACHE_PORT=80 --name beanstalk_console agaveapi/beanstalkd-console
 
-# Beanstalk консоль ![Русская версия](http://upload.wikimedia.org/wikipedia/en/thumb/f/f3/Flag_of_Russia.svg/22px-Flag_of_Russia.svg.png)
+To configure webapp with a custom beanstalk server to load at runtime, set the `BEANSTALKD_HOST` and `BEANSTALKD_PORT` environment variables.
 
-*Административная консоль для сервера очередей [Beanstalk](http://kr.github.com/beanstalkd), написанная на PHP*
+    docker run -d -p 80:80 \
+               --name beanstalk_console \
+               -e 'BEANSTALKD_HOST=beanstalkd' \
+               -e 'BEANSTALKD_PORT=11300' \
+               beanstalk_console
 
-**Возможности**
+To spin up a console with a beanstalkd server all at once, install [Docker Compose](https://docs.docker.com/compose/) and run (from project root):
 
-- Общий список серверов в конфиге для всех пользователей
-- Каждый пользователь может добавить свой персональный сервер
-- Полный список доступных труб
-- Полная статистика тасков в трубах
-- Realtime-обновление с подсветкой изменившихся значений
-- Вы можете просматривать таски в каждой трубе (ready/delayed/buried)
-- Вы можете выполнять операции с тасками в каждой трубе (add/kick/delete)
+    docker-compose up
 
-**Установка**
+### Setup using vagrant
 
-[Скачайте](https://github.com/ptrofimov/beanstalk_console/archive/master.zip), положите распакованные файлы в www папку и наслаждайтесь!
+Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) and [vagrant](http://www.vagrantup.com/downloads.html) then run (from project root):
 
-**Установка с помощью vagrant**
+    vagrant up
 
-Установите [VirtualBox](https://www.virtualbox.org/wiki/Downloads) и [vagrant](http://www.vagrantup.com/downloads.html) затем запустите (в корневой директории проекта):
+After provision beanstalk console will be available at [http://localhost:7654](http://localhost:7654) (port could be configured in Vagrantfile)
 
-    vagrant up
+### Download an Archive File
 
-После завершения провизии консоль будет доступна по адресу [http://localhost:7654](http://localhost:7654) (порт можно сконфигурировать в Vagrantfile)
+[Download](https://github.com/ptrofimov/beanstalk_console/archive/master.zip), unzip files to your *www* directory and launch from *public* directory, enjoy!
 
-**Авторы:** Петр Трофимов, Сергей Лысенко, Pentium10
+**Authors:** Petr Trofimov, Sergey Lysenko, Pentium10
 
 --------------------------------------------------
 

Vagrantfile

@@ -4,8 +4,8 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-	config.vm.box = "precise64"
-	config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+	config.vm.box = "hashicorp/precise64"
+	config.vm.box_url = "https://vagrantcloud.com/hashicorp/boxes/precise64/versions/1.1.0/providers/virtualbox.box"
 
 	# expose ports
 	config.vm.network :forwarded_port, host: 7654, guest: 80

composer.json

@@ -3,14 +3,14 @@
     "description": "Admin console for Beanstalk queue server",
     "keywords": ["beanstalk", "beanstalkd", "queue", "console", "gui", "admin", "web admin", "monitoring", "stats", "interface", "php"],
     "type": "project",
-	"authors": [
+    "authors": [
         {
             "name": "Petr Trofimov"
         },
         {
             "name": "Sergey Lysenko"
         },
-		{
+        {
             "name": "Pentium10"
         }
     ],
@@ -20,6 +20,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.2.0",
-        "ext-json": "*"
+        "ext-json": "*",
+        "ext-mbstring": "*"
     }
 }

config.php

@@ -1,16 +1,78 @@
-<?php
-
-$config = array(
-    /**
-     * List of servers available for all users
-     */
-    'servers' => array(/* 'localhost:11300' */),
-    /**
-     * Saved samples jobs are kept in this file, must be writable
-     */
-    'storage' => dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage.json',
-    /**
-     * Version number
-     */
-    'version' => '1.5.1',
-);
+<?php
+
+/**
+ * =============================================================================
+ * LOCAL CONFIGURATION OVERRIDE INSTRUCTIONS
+ * =============================================================================
+ *
+ * This file (`config.php`) contains the default configuration settings.
+ * PLEASE DO NOT EDIT THIS FILE DIRECTLY for your local setup, as your
+ * changes will be overwritten when you update the project via Git.
+ *
+ * Instead, follow these steps to create local overrides:
+ *
+ * 1. CREATE A NEW FILE: In this same directory, create a file named:
+ *    `config.local.php`
+ *
+ * 2. COPY BELOW CONFIGURATION + DEFINE OVERRIDES: Inside `config.local.php`
+ *
+ * =============================================================================
+ */
+
+define('BEANSTALK_CONSOLE_VERSION', '1.8.1');
+
+$localConfigFile = __DIR__ . '/config.local.php';
+if (file_exists($localConfigFile) && is_readable($localConfigFile) && basename(__FILE__) !== 'config.local.php') {
+    require $localConfigFile;
+    if (count($GLOBALS['config'], true) != 1 && count($GLOBALS['config'], true) < 16) {
+        die('Please update your config.local.php with all new options. You are missing some.');
+    }
+    if (is_array($GLOBALS['config']['servers'])) {
+        return;
+    }
+}
+/**
+ * =============================================================================
+ * LOCAL CONFIGURATION `config.local.php` CONTENTS BELOW
+ * =============================================================================
+ */
+
+$GLOBALS['config'] = array(
+    /**
+     * List of servers available for all users
+     */
+    'servers' => array(/* 'Local Beanstalkd' => 'beanstalk://localhost:11300', ... */),
+    /**
+     * Saved samples jobs are kept in this file, must be writable
+     */
+    'storage' => dirname(__FILE__) . DIRECTORY_SEPARATOR . 'storage.json',
+    /**
+     * Optional Basic Authentication
+     */
+    'auth' => array(
+        'enabled' => false,
+        'username' => 'admin',
+        'password' => 'password',
+    ),
+
+    /**
+     * Default UI settings (used when no cookie is present).
+     * These values will be overridden by user-specific selection in Settings screen and kept in cookies.
+     * Keys use a positive 'enableFeature' convention where applicable.
+     * 'true' means the feature is ON by default.
+     * 'false' means the feature is OFF by default.
+     */
+    'settings' => array(
+        // Numeric settings
+        'tubePauseSeconds'          => -1,    // Default: -1 (uses beanstalkd default of 1 hour)
+        'autoRefreshTimeoutMs'      => 500,   // Default: 500ms interval for auto-refresh
+        'searchResultLimit'         => 25,    // Default: 25 results in search
+
+        // Boolean settings (true = enabled/checked by default)
+        'enableJsonDecode'          => true,  // Default: Job data IS json_decoded by default
+        'enableJobDataHighlight'    => true,  // Default: Job data highlighting IS enabled by default
+        'enableAutoRefreshLoad'     => false,  // Default: Auto-refresh IS disabled on page load
+        'enableUnserialization'     => false, // Default: Job data IS NOT unserialized by default
+        'enableBase64Decode'        => false, // Default: Job data IS NOT base64_decoded by default
+    ),
+);

docker-compose.yml

@@ -0,0 +1,42 @@
+##
+# docker-compose.yml
+#
+# author: Rion Dooley <dooley@tacc.utexas.edu>
+#
+# This is a basic Docker Compose file to start the beanstalkd console webapp and a
+# fully functional beanstalkd instance in a single command. The beanstalkd server
+# is accessible on standard port 11300. The beanstalkd console is available at
+# http://<your docker host>:9080.
+#
+# By default, a new image will be built from the the source code in this repository.
+# You may also skip the build step and use the public, automated build of this
+# repository by commenting out the build argument and uncommenting the image argument.
+#
+# If you need a persistent beanstalkd binlog, simply uncomment the last 5 lines.
+#
+#
+
+---
+version: '3'
+
+
+services:
+  web:
+    ## Optionally; you can use a ready image changing:
+    ## * `build: .`
+    ## into:
+    ## * image: agaveapi/beanstalkd-console
+    build: .
+    ports:
+      - 80:80
+    environment:
+      - BEANSTALKD_HOST=beanstalkd
+    links:
+      - beanstalkd
+  beanstalkd:
+    image: dinamic/docker-alpine-beanstalkd
+    volumes:
+      - beanstalkd_data:/var/lib/beanstald
+
+volumes:
+  beanstalkd_data:

docker/README.md

@@ -0,0 +1,50 @@
+# Running Beanstalkd Console
+================================
+
+This project has been Dockerized for easier deployment and use. Instructions on building and running are given here.
+
+## Building
+
+To build a fresh container, run the following command, substituting whatever tag you would like to give the resulting image.
+
+```
+docker build -rm -t beanstalkd-console .
+```
+
+## Running Containers
+
+Once built, you can run a container manually using the following command.
+
+```
+docker run -d -p 80:80 --name beanstalk_console beanstalk_console
+```
+
+If you need a beanstalk server to test against, you can use the public image created by the [Agave](http://agaveapi.co) dev team in the [Docker Registry](https://hub.docker.com/r/agaveapi/beanstalkd), `agaveapi/beanstalkd`. The following command will start a beanstalkd on the host machine and make the the default port available.
+
+```
+docker run -h beanstalkd -d -p 11300:11300 beanstalkd
+```
+
+## Runtime Configuration
+
+To configure webapp with a custom beanstalk server to load at runtime, set the `BEANSTALKD_HOST` and `BEANSTALKD_PORT` environment variables.
+
+```
+docker run -d -p 80:80 \
+					 --name beanstalk_console \
+					 -e 'BEANSTALKD_HOST=beanstalkd' \
+					 -e 'BEANSTALKD_PORT=11300' \
+					 beanstalk_console
+```
+
+## Logging
+
+By default, all access and error logs will stream to stdout and be available through the Docker Event Stream and `docker logs` command.
+
+## Orchestrating Infrastructure
+
+To make the orchestration process a bit easier, a [Docker Compose](https://docs.docker.com/compose/) file is available. The following command will start both the console and daemon servers ready to use out of the box. The beanstalk server will be available on the default `11300` port. The beanstalkd console will be available at `http://<your docker host>/`.
+
+```
+docker-compose up
+```

docker/apache_vhost

@@ -0,0 +1,7 @@
+<VirtualHost *:80>
+  ServerSignature off
+  ServerAdmin webmaster@localhost
+  DocumentRoot /var/www/public
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>