diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 3b89398..0000000 --- a/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM ubuntu:14.04 - -# Install packages -RUN apt-get update -RUN apt-get -y install git -RUN apt-get -y install apache2 mysql-server libapache2-mod-php5 imagemagick php5-mysql php5-gd php5-curl php5-imagick - -# Modify php.ini to contain the following settings: -# max_execution_time = 200 -# post_max_size = 100M -# upload_max_size = 100M -# upload_max_filesize = 20M -# memory_limit = 256M -RUN sed -i -e "s/^max_execution_time\s*=.*/max_execution_time = 200/" \ --e "s/^post_max_size\s*=.*/post_max_size = 100M/" \ --e "s/^upload_max_filesize\s*=.*/upload_max_filesize = 20M\nupload_max_size = 100M/" \ --e "s/^memory_limit\s*=.*/memory_limit = 256M/" /etc/php5/apache2/php.ini - -# Link /var/www to /app directory -RUN mkdir -p /app && rm -fr /var/www/html && ln -s /app /var/www/html -WORKDIR /app - -# Clone lychee -RUN git clone https://github.com/electerious/Lychee.git . - -# Set file permissions -RUN chown -R www-data:www-data /app -RUN chmod -R 777 uploads/ data/ - -EXPOSE 80 -CMD src/commands/start \ No newline at end of file diff --git a/README.md b/README.md index 437e06a..9268148 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,10 @@ Lychee supports [Twitter Cards](https://dev.twitter.com/docs/cards) and [Open Gr Lychee uses [Imagick](http://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](http://www.imagemagick.org) in [the settings](docs/Settings.md). +### Docker + +Browse the [Docker Hub Registry](https://hub.docker.com/r/kdelfour/lychee-docker/) for various automated Lychee-Docker builds. We recommed to use [lychee-docker](https://hub.docker.com/r/kdelfour/lychee-docker/) by [kdelfour](https://github.com/kdelfour). + ### Plugins and Extensions The plugin-system of Lychee allows you to execute scripts, when a certain action fires. Plugins are hooks, which are injected directly into Lychee. [Plugin documentation »](docs/Plugins.md) diff --git a/src/commands/start b/src/commands/start deleted file mode 100755 index 60f0254..0000000 --- a/src/commands/start +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Run this script to start Apache and MySQL - -# Start MySQL -mysqld & - -# Start Apache -source /etc/apache2/envvars -exec apache2 -D FOREGROUND \ No newline at end of file