From 11d77328dccbcf6a9627aad6bc4636e71087b6ee Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 7 Aug 2015 11:59:37 +0100 Subject: [PATCH] Remove docker/homestead/vagrant stuff --- .gitignore | 1 - Dockerfile | 37 ---------------------- Homestead.yaml | 40 ------------------------ Vagrantfile | 23 -------------- composer.json | 1 - docker/.env.docker | 27 ---------------- docker/crontab | 2 -- docker/entrypoint.sh | 66 ---------------------------------------- docker/nginx-site.conf | 30 ------------------ docker/php-fpm-pool.conf | 25 --------------- docker/supervisord.conf | 28 ----------------- 11 files changed, 280 deletions(-) delete mode 100644 Dockerfile delete mode 100644 Homestead.yaml delete mode 100644 Vagrantfile delete mode 100644 docker/.env.docker delete mode 100644 docker/crontab delete mode 100755 docker/entrypoint.sh delete mode 100644 docker/nginx-site.conf delete mode 100644 docker/php-fpm-pool.conf delete mode 100644 docker/supervisord.conf diff --git a/.gitignore b/.gitignore index b53d52e5..51669198 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ node_modules phpunit.xml vendor -.vagrant diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 6b2c5069..00000000 --- a/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM debian:jessie - -# Using nodesource and debian jessie packages instead of compiling from scratch -RUN DEBIAN_FRONTEND=noninteractive \ - echo "APT::Install-Recommends \"0\";" >> /etc/apt/apt.conf.d/02recommends && \ - echo "APT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/02recommends && \ - apt-get -qq update && \ - apt-get -qq install \ - ca-certificates nginx php5-fpm=5.* php5-curl php5-readline php5-mcrypt php5-mysql php5-apcu php5-cli \ - git sqlite libsqlite3-dev curl supervisor cron php5-pgsql && \ - apt-get clean && apt-get autoremove -qq && \ - rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/* - -COPY docker/supervisord.conf /etc/supervisor/supervisord.conf -COPY docker/entrypoint.sh /sbin/entrypoint.sh -COPY . /var/www/html/ -WORKDIR /var/www/html/ - -# copy the various nginx and supervisor conf (to handle both fpm and nginx) -RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf ;\ - echo "daemon off;" >> /etc/nginx/nginx.conf ;\ - mv /var/www/html/docker/php-fpm-pool.conf /etc/php5/fpm/pool.d/www.conf ;\ - rm -f /etc/nginx/sites-enabled/* ;\ - rm -f /etc/nginx/conf.d/* ;\ - mv /var/www/html/docker/nginx-site.conf /etc/nginx/conf.d/default.conf ;\ - mv /var/www/html/docker/.env.docker /var/www/html/.env ;\ - rm -r /var/www/html/docker ;\ - chown -R www-data /var/www/html ;\ - curl -sS https://getcomposer.org/installer | php && php composer.phar install --no-dev -o - -EXPOSE 8000 - -COPY docker/crontab /etc/cron.d/artisan-schedule -RUN chmod 0644 /etc/cron.d/artisan-schedule -RUN touch /var/log/cron.log - -CMD ["/sbin/entrypoint.sh"] diff --git a/Homestead.yaml b/Homestead.yaml deleted file mode 100644 index 9c2d4333..00000000 --- a/Homestead.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -ip: "192.168.10.10" -memory: 2048 -cpus: 1 -hostname: cachet -name: cachet -provider: virtualbox - -authorize: ~/.ssh/id_rsa.pub - -keys: - - ~/.ssh/id_rsa - -folders: - - map: "/srv/www/Cachet" - to: "/home/vagrant/Cachet" - -sites: - - map: homestead.app - to: "/home/vagrant/Cachet/public" - -databases: - - cachet - -variables: - - key: APP_ENV - value: local - -# blackfire: -# - id: foo -# token: bar -# client-id: foo -# client-token: bar - -# ports: -# - send: 93000 -# to: 9300 -# - send: 7777 -# to: 777 -# protocol: udp diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index ae03f592..00000000 --- a/Vagrantfile +++ /dev/null @@ -1,23 +0,0 @@ -require 'json' -require 'yaml' - -VAGRANTFILE_API_VERSION = "2" -confDir = $confDir ||= File.expand_path("vendor/laravel/homestead") - -homesteadYamlPath = "Homestead.yaml" -afterScriptPath = "after.sh" -aliasesPath = "aliases" - -require File.expand_path(confDir + '/scripts/homestead.rb') - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - if File.exists? aliasesPath then - config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases" - end - - Homestead.configure(config, YAML::load(File.read(homesteadYamlPath))) - - if File.exists? afterScriptPath then - config.vm.provision "shell", path: afterScriptPath - end -end diff --git a/composer.json b/composer.json index d11ca02e..88561172 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,6 @@ }, "require-dev": { "fzaninotto/faker": "^1.5", - "laravel/homestead": "^2.1.5", "mockery/mockery": "^0.9.4", "phpunit/phpunit": "^4.7.6" }, diff --git a/docker/.env.docker b/docker/.env.docker deleted file mode 100644 index fed757fa..00000000 --- a/docker/.env.docker +++ /dev/null @@ -1,27 +0,0 @@ -APP_ENV={{APP_ENV}} -APP_DEBUG={{APP_DEBUG}} -APP_URL={{APP_URL}} -APP_KEY={{APP_KEY}} - -DB_DRIVER={{DB_DRIVER}} -DB_HOST={{DB_HOST}} -DB_DATABASE={{DB_DATABASE}} -DB_USERNAME={{DB_USERNAME}} -DB_PASSWORD={{DB_PASSWORD}} - -CACHE_DRIVER={{CACHE_DRIVER}} -SESSION_DRIVER={{SESSION_DRIVER}} -QUEUE_DRIVER={{QUEUE_DRIVER}} - -MAIL_DRIVER={{MAIL_DRIVER}} -MAIL_HOST={{MAIL_HOST}} -MAIL_PORT={{MAIL_PORT}} -MAIL_USERNAME={{MAIL_USERNAME}} -MAIL_PASSWORD={{MAIL_PASSWORD}} -MAIL_ADDRESS={{MAIL_ADDRESS}} -MAIL_NAME={{MAIL_NAME}} - -REDIS_HOST={{REDIS_HOST}} -REDIS_DATABASE={{REDIS_DATABASE}} -REDIS_PORT={{REDIS_PORT}} - diff --git a/docker/crontab b/docker/crontab deleted file mode 100644 index 1b0fa150..00000000 --- a/docker/crontab +++ /dev/null @@ -1,2 +0,0 @@ -#minute hour mday month wday who command -* * * * * www-data php /var/www/html/artisan schedule:run 1>> /dev/null 2>&1 diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100755 index 0a73b813..00000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -set -e - -APP_ENV=${APP_ENV:-local} -APP_DEBUG=${APP_DEBUG:-true} -APP_URL=${APP_URL:-http://localhost} -APP_KEY=${APP_KEY:-SomeRandomString} - -DB_DRIVER=${DB_DRIVER:-mysql} -DB_HOST=${DB_HOST:-mysql} -DB_DATABASE=${DB_DATABASE:-cachet} -DB_USERNAME=${DB_USERNAME:-cachet} -DB_PASSWORD=${DB_PASSWORD:-cachet} - -CACHE_DRIVER=${CACHE_DRIVER:-file} -SESSION_DRIVER=${SESSION_DRIVER:-file} -QUEUE_DRIVER=${QUEUE_DRIVER:-database} - -MAIL_DRIVER=${MAIL_DRIVER:-smtp} -MAIL_HOST=${MAIL_HOST:-mailtrap.io} -MAIL_PORT=${MAIL_PORT:-2525} -MAIL_USERNAME=${MAIL_USERNAME:-null} -MAIL_PASSWORD=${MAIL_PASSWORD:-null} -MAIL_ADDRESS=${MAIL_ADDRESS:-null} -MAIL_NAME=${MAIL_NAME:-null} - -REDIS_HOST=${REDIS_HOST:-null} -REDIS_DATABASE=${REDIS_DATABASE:-null} -REDIS_PORT=${REDIS_PORT:-null} - -# configure env file - -sed 's,{{APP_ENV}},'"${APP_ENV}"',g' -i /var/www/html/.env -sed 's,{{APP_DEBUG}},'"${APP_DEBUG}"',g' -i /var/www/html/.env -sed 's,{{APP_URL}},'"${APP_URL}"',g' -i /var/www/html/.env -sed 's,{{APP_KEY}},'"${APP_KEY}"',g' -i /var/www/html/.env - -sed 's,{{DB_DRIVER}},'"${DB_DRIVER}"',g' -i /var/www/html/.env -sed 's,{{DB_HOST}},'"${DB_HOST}"',g' -i /var/www/html/.env -sed 's,{{DB_DATABASE}},'"${DB_DATABASE}"',g' -i /var/www/html/.env -sed 's,{{DB_USERNAME}},'"${DB_USERNAME}"',g' -i /var/www/html/.env -sed 's,{{DB_PASSWORD}},'"${DB_PASSWORD}"',g' -i /var/www/html/.env - -sed 's,{{CACHE_DRIVER}},'"${CACHE_DRIVER}"',g' -i /var/www/html/.env -sed 's,{{SESSION_DRIVER}},'"${SESSION_DRIVER}"',g' -i /var/www/html/.env -sed 's,{{QUEUE_DRIVER}},'"${QUEUE_DRIVER}"',g' -i /var/www/html/.env - -sed 's,{{MAIL_DRIVER}},'"${MAIL_DRIVER}"',g' -i /var/www/html/.env -sed 's,{{MAIL_HOST}},'"${MAIL_HOST}"',g' -i /var/www/html/.env -sed 's,{{MAIL_PORT}},'"${MAIL_PORT}"',g' -i /var/www/html/.env -sed 's,{{MAIL_USERNAME}},'"${MAIL_USERNAME}"',g' -i /var/www/html/.env -sed 's,{{MAIL_PASSWORD}},'"${MAIL_PASSWORD}"',g' -i /var/www/html/.env -sed 's,{{MAIL_ADDRESS}},'"${MAIL_ADDRESS}"',g' -i /var/www/html/.env -sed 's,{{MAIL_NAME}},'"${MAIL_NAME}"',g' -i /var/www/html/.env - -sed 's,{{REDIS_HOST}},'"${REDIS_HOST}"',g' -i /var/www/html/.env -sed 's,{{REDIS_DATABASE}},'"${REDIS_DATABASE}"',g' -i /var/www/html/.env -sed 's,{{REDIS_PORT}},'"${REDIS_PORT}"',g' -i /var/www/html/.env - -#Clear cache -/usr/bin/php composer.phar install --no-dev -o - -echo "Starting supervisord..." -exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf - -exit 0 diff --git a/docker/nginx-site.conf b/docker/nginx-site.conf deleted file mode 100644 index a0fc3041..00000000 --- a/docker/nginx-site.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen 8000 default; ## Listen for ipv4; this line is default and implied - - # Make site accessible from http://localhost/ - server_name localhost; - root /var/www/html/public; - - index index.html index.htm index.php; - - charset utf-8; - - location / { - try_files $uri $uri/ /index.php?$query_string; - } - - # Pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include fastcgi_params; - fastcgi_pass 127.0.0.1:9000; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_index index.php; - fastcgi_keep_conn on; - } - - location ~ /\.ht { - deny all; - } - -} diff --git a/docker/php-fpm-pool.conf b/docker/php-fpm-pool.conf deleted file mode 100644 index c7283029..00000000 --- a/docker/php-fpm-pool.conf +++ /dev/null @@ -1,25 +0,0 @@ -[www] -user = www-data -group = www-data - -listen = 127.0.0.1:9000 - -request_terminate_timeout = 120s - -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -chdir = / - -env[DB_DRIVER] = $DB_DRIVER -env[DB_HOST] = $DB_HOST -env[DB_DATABASE] = $DB_DATABASE -env[DB_USERNAME] = $DB_USERNAME -env[DB_PASSWORD] = $DB_PASSWORD -env[CACHE_DRIVER] = $CACHE_DRIVER - - -[global] -daemonize = no diff --git a/docker/supervisord.conf b/docker/supervisord.conf deleted file mode 100644 index c3e6f453..00000000 --- a/docker/supervisord.conf +++ /dev/null @@ -1,28 +0,0 @@ -[unix_http_server] -file=/var/run/supervisor.sock ; (the path to the socket file) - -[supervisord] -logfile=/dev/null ; (main log file;default $CWD/supervisord.log) -logfile_maxbytes=0 ; (max main logfile bytes b4 rotation;default 50MB) -logfile_backups=0 ; (num of main logfile rotation backups;default 10) -loglevel=info ; (log level;default info; others: debug,warn,trace) -pidfile=/tmp/supervisord.pid ; (supervisord pidfile;default supervisord.pid) -nodaemon=true ; (start in foreground if true;default false) - -; the below section must remain in the config file for RPC -; (supervisorctl/web interface) to work, additional interfaces may be -; added by defining them in separate rpcinterface: sections -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket - -[program:php5-fpm] -command=/usr/sbin/php5-fpm -c /etc/php5/fpm - -[program:nginx] -command=/usr/sbin/nginx - -[program:cron] -command=/usr/sbin/cron -f