Merge pull request #89 from wallabag/wallabag-23

Updated image to wallabag 2.3.0
Forced postgres 9.6
2025-12-13 09:46:27 +00:00 · 2017-12-13 22:43:17 +01:00 · 2017-12-13 22:32:43 +01:00 · 2017-12-12 22:28:19 +01:00 · 2017-08-25 08:55:41 +02:00 · 2017-07-20 21:32:25 +02:00
9 changed files with 119 additions and 53 deletions
--- a/77
+++ b/77
@@ -1,62 +1,61 @@
 FROM alpine:edge
-MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org>

-ENV WALLABAG_VERSION=2.1.4 \
-    POSTGRES_USER=postgres
+LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>"

-RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --update \
+ARG WALLABAG_VERSION=2.3.0
+
+RUN set -ex \
+ && apk update \
+ && apk upgrade --available \
+ && apk add \
      ansible \
      curl \
      git \
-      libwebp@testing \
+      libwebp \
      mariadb-client \
      nginx \
      pcre \
      php7 \
-      php7-amqp@testing \
+      php7-amqp \
      php7-bcmath \
-      php7-ctype@testing \
-      php7-curl@testing \
-      php7-dom@testing \
-      php7-fpm@testing \
-      php7-gd@testing \
-      php7-gettext@testing \
-      php7-iconv@testing \
-      php7-json@testing \
-      php7-mbstring@testing \
-      php7-openssl@testing \
-      php7-pdo_mysql@testing \
-      php7-pdo_pgsql@testing \
-      php7-pdo_sqlite@testing \
-      php7-phar@testing \
-      php7-session@testing \
-      php7-xml@testing \
-      php7@testing\
+      php7-ctype \
+      php7-curl \
+      php7-dom \
+      php7-fpm \
+      php7-gd \
+      php7-gettext \
+      php7-iconv \
+      php7-json \
+      php7-mbstring \
+      php7-openssl \
+      php7-pdo_mysql \
+      php7-pdo_pgsql \
+      php7-pdo_sqlite \
+      php7-phar \
+      php7-session \
+      php7-simplexml \
+      php7-tokenizer \
+      php7-xml \
+      php7-zlib \
      py-mysqldb \
      py-psycopg2 \
      py-simplejson \
+      rabbitmq-c \
      s6 \
      tar \
- && rm -rf /var/cache/apk/*
-
-RUN ln -s /usr/bin/php7 /usr/bin/php \
+ && rm -rf /var/cache/apk/* \
 && ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log
-
-RUN curl -s http://getcomposer.org/installer | php \
- && mv composer.phar /usr/local/bin/composer
-
-RUN git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag
+ && ln -sf /dev/stderr /var/log/nginx/error.log \
+ && curl -s https://getcomposer.org/installer | php \
+ && mv composer.phar /usr/local/bin/composer \
+ && git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag

 COPY root /

-RUN cd /var/www/wallabag \
- && SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-
-RUN chown -R nobody:nobody /var/www/wallabag
-
-RUN chmod +x /entrypoint.sh
+RUN set -ex \
+ && cd /var/www/wallabag \
+ && SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist \
+ && chown -R nobody:nobody /var/www/wallabag

 EXPOSE 80
 ENTRYPOINT ["/entrypoint.sh"]
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ Default login is `wallabag:wallabag`.
 - `-e SYMFONY__ENV__MAILER_PASSWORD=...`(defaults to "~", the SMTP password)
 - `-e SYMFONY__ENV__FROM_EMAIL=...`(defaults to "wallabag@example.com", the address wallabag uses for outgoing emails)
 - `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration)
+- `-e SYMFONY__ENV__DOMAIN_NAME=...`  defaults to "https://your-wallabag-url-instance.com", the URL of your wallabag instance)
+- `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)

 ## SQLite

@@ -41,7 +43,7 @@ $ docker run -p 80:80 wallabag/wallabag
 and point your browser to `http://localhost:80`. For persistent storage you should start the container with a volume:

 ```
-$ docker run -v /opt/wallabag:/var/www/wallabag/data -p 80:80 wallabag/wallabag
+$ docker run -v /opt/wallabag/data:/var/www/wallabag/data -v -/opt/wallabag/images:/var/www/wallabag/web/assets/images -p 80:80 wallabag/wallabag
 ```

 ## MariaDB / MySQL
@@ -58,7 +60,7 @@ $ docker run --name wallabag --link wallabag-db:wallabag-db -e "MYSQL_ROOT_PASSW
 For using PostgreSQL you have to define some environment variables with the container. Example:

 ```
-$ docker run --name wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -d postgres
+$ docker run --name wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -d postgres:9.6
 $ docker run --name wallabag --link wallabag-db:wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -e "SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql" -e "SYMFONY__ENV__DATABASE_HOST=wallabag-db" -e "SYMFONY__ENV__DATABASE_PORT=5432" -e "SYMFONY__ENV__DATABASE_NAME=wallabag" -e "SYMFONY__ENV__DATABASE_USER=wallabag" -e "SYMFONY__ENV__DATABASE_PASSWORD=wallapass" -p 80:80 wallabag/wallabag
 ```

@@ -71,12 +73,18 @@ $ docker run -p 6379:6379 --name redis redis:alpine
 $ docker run -p 80:80 --link redis:redis wallabag/wallabag
 ```

-## DB migration
+## Upgrading

-If there is a version upgrade that needs a database migration, you should start the container with the new image and run the migration command.
+If there is a version upgrade that needs a database migration. The most easy way to do is running the `migrate` command:

 ```
-$ docker exec -t wallabag /var/www/wallabag/bin/console doctrine:migrations:migrate --env=prod --no-interaction
+$ docker run --link wallabag-db:wallabag-db -e <... your config variables here ...>  wallabag/wallabag migrate
+```
+
+Or you can start the container with the new image and run the migration command manually:
+
+```
+$ docker exec -t NAME_OR_ID_OF_YOUR_WALLABAG_CONTAINER /var/www/wallabag/bin/console doctrine:migrations:migrate --env=prod --no-interaction
 ```

 ## docker-compose
@@ -84,7 +92,7 @@ $ docker exec -t wallabag /var/www/wallabag/bin/console doctrine:migrations:migr
 It's a good way to use [docker-compose](https://docs.docker.com/compose/). Example:

 ```
-version: '2'
+version: '3'
 services:
  wallabag:
    image: wallabag/wallabag
@@ -102,12 +110,14 @@ services:
      - SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
    ports:
      - "80"
+    volumes:
+      - /opt/wallabag/images:/var/www/wallabag/web/assets/images
  db:
    image: mariadb
    environment:
      - MYSQL_ROOT_PASSWORD=wallaroot
    volumes:
-      - /opt/wallabag:/var/lib/mysql
+      - /opt/wallabag/data:/var/lib/mysql
  redis:
    image: redis:alpine
 ```
@@ -136,3 +146,11 @@ server {

 }
 ```
+
+## Import worker
+
+To run the [async redis import worker](http://doc.wallabag.org/en/master/developer/asynchronous.html#install-redis-for-asynchronous-tasks) use the following command:
+```
+$ docker run --name wallabag --link wallabag-db:wallabag-db --link redis:redis -e <... your config variables here ...>  wallabag/wallabag import <type>
+```
+Where `<type>` is one of pocket, readability, instapaper, wallabag_v1, wallabag_v2, firefox or chrome.
--- a/root/entrypoint.sh
+++ b/root/entrypoint.sh
@@ -1,8 +1,28 @@
 #!/bin/sh

+provisioner () {
+    echo "Starting provisioner..."
+    if ! out=`ansible-playbook -i /etc/ansible/hosts /etc/ansible/entrypoint.yml -c local "$@"`;then
+        echo $out;
+    fi
+    echo "Provisioner finished."
+}
+
 if [ "$1" = "wallabag" ];then
-    ansible-playbook -i /etc/ansible/hosts /etc/ansible/entrypoint.yml -c local
+    provisioner
    exec s6-svscan /etc/s6/
 fi

+if [ "$1" = "import" ];then
+    provisioner --skip-tags=firstrun
+    cd /var/www/wallabag/
+    exec su -c "bin/console wallabag:import:redis-worker -e=prod $2 -vv" -s /bin/sh nobody
+fi
+
+if [ "$1" = "migrate" ];then
+    provisioner
+    cd /var/www/wallabag/
+    exec su -c "bin/console doctrine:migrations:migrate --env=prod --no-interaction" -s /bin/sh nobody
+fi
+
 exec "$@"
--- a/root/etc/ansible/entrypoint.yml
+++ b/root/etc/ansible/entrypoint.yml
@@ -13,12 +13,14 @@
    database_root_user_postgres: "{{ lookup('env', 'POSTGRES_USER') }}"
    database_root_password_postgres: "{{ lookup('env', 'POSTGRES_PASSWORD') }}"
    database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER')|default('root', true) }}"
+    populate_database: "{{ lookup('env', 'POPULATE_DATABASE')|default(True, true) }}"
    secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}"
    mailer_host: "{{ lookup('env', 'SYMFONY__ENV__MAILER_HOST')|default('127.0.0.1', true) }}"
    mailer_user: "{{ lookup('env', 'SYMFONY__ENV__MAILER_USER')|default('~', true) }}"
    mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}"
    from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}"
    registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}"
+    domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}"

  tasks:

@@ -33,6 +35,8 @@
        - /var/www/wallabag/data/assets
        - /var/www/wallabag/data/db
      notify: chown dir
+      tags:
+        - firstrun

    - name: write parameters.yml
      template:
@@ -67,8 +71,12 @@
        login_port={{ database_port }}
        login_user=root
        login_password="{{ database_root_password_mariadb }}"
+        encoding="utf8mb4"
      notify: run install
-      when: database_driver == 'pdo_mysql'
+      when: (database_driver == 'pdo_mysql') and
+            (populate_database == True)
+      tags:
+        - firstrun

    - name: add mariadb user
      mysql_user:
@@ -82,7 +90,10 @@
        login_password="{{ database_root_password_mariadb }}"
        state=present
      when: (database_driver == 'pdo_mysql') and
-            (database_user != 'root')
+            (database_user != 'root') and
+            (populate_database == True)
+      tags:
+        - firstrun

    - name: postgresql db
      postgresql_db:
@@ -93,7 +104,10 @@
        login_user="{{ database_root_user_postgres }}"
        login_password="{{ database_root_password_postgres }}"
      notify: run install
-      when: database_driver == 'pdo_pgsql'
+      when: (database_driver == 'pdo_pgsql') and
+            (populate_database == True)
+      tags:
+        - firstrun

    - name: add postgresql user
      postgresql_user:
@@ -107,7 +121,10 @@
        login_password="{{ database_root_password_postgres }}"
        state=present
      when: (database_driver == 'pdo_pgsql') and
-            (database_user != 'postgres')
+            (database_user != 'postgres') and
+            (populate_database == True)
+      tags:
+        - firstrun

    - name: remove cache
      file:
--- a/root/etc/ansible/templates/parameters.yml.j2
+++ b/root/etc/ansible/templates/parameters.yml.j2
@@ -8,6 +8,9 @@ parameters:
    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
    database_table_prefix: wallabag_
    database_socket: null
+    database_charset: utf8
+
+    domain_name: {{ domain_name }}

    mailer_transport:  smtp
    mailer_host:       {{ mailer_host }}
@@ -36,9 +39,11 @@ parameters:
    rabbitmq_port: 5672
    rabbitmq_user: guest
    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10

    # Redis processing
    redis_scheme: tcp
    redis_host: redis
    redis_port: 6379
    redis_path: null
+    redis_password: null
--- a/root/etc/php7/php.ini
+++ b/root/etc/php7/php.ini
@@ -268,7 +268,7 @@ output_buffering = 4096
 ; Note: You need to use zlib.output_handler instead of the standard
 ;   output_handler, or otherwise the output will be corrupted.
 ; http://php.net/zlib.output-compression
-zlib.output_compression = Off
+zlib.output_compression = On

 ; http://php.net/zlib.output-compression-level
 ;zlib.output_compression_level = -1
--- a/root/etc/s6/.s6-svscan/finish
+++ b/root/etc/s6/.s6-svscan/finish
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /bin/true
--- a/root/var/www/wallabag/app/config/parameters.yml
+++ b/root/var/www/wallabag/app/config/parameters.yml
@@ -8,6 +8,9 @@ parameters:
    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
    database_table_prefix: wallabag_
    database_socket: null
+    database_charset: utf8
+
+    domain_name: https://your-wallabag-url-instance.com

    test_database_driver: pdo_sqlite
    test_database_host: 127.0.0.1
@@ -44,9 +47,11 @@ parameters:
    rabbitmq_port: 5672
    rabbitmq_user: guest
    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10

    # Redis processing
    redis_scheme: tcp
    redis_host: localhost
    redis_port: 6379
    redis_path: null
+    redis_password: null
--- a/tests/docker-compose.postgresql.yml
+++ b/tests/docker-compose.postgresql.yml
@@ -18,7 +18,7 @@ services:
    ports:
      - "127.0.0.1:80:80"
  db:
-    image: postgres
+    image: postgres:9.6
    environment:
      - POSTGRES_PASSWORD=my-secret-pw
      - POSTGRES_USER=my-super-user
Author	SHA1	Message	Date
Nicolas Lœuillet	6a7bbbb8d0	Merge pull request #89 from wallabag/wallabag-23 Updated image to wallabag 2.3.0	2017-12-13 22:43:17 +01:00
Nicolas Lœuillet	e5456115c1	Forced postgres 9.6	2017-12-13 22:32:43 +01:00
Nicolas Lœuillet	7b68684720	Updated image to wallabag 2.3.0	2017-12-12 22:28:19 +01:00
Nicolas Lœuillet	434b17cd8f	Merge pull request #74 from Strubbl/use-ssl-for-composer-install use https for getting composer	2017-08-25 08:55:41 +02:00
Sven Fischer	5123e9de38	use https for getting composer	2017-07-20 21:32:25 +02:00
Marvin Steadfast	5682aefa74	changed docs for persistent storage of images. #71	2017-05-30 11:19:36 +02:00
Thomas Citharel	bf82658342	Merge pull request #69 from wallabag/update-223 Update Dockerfile to 2.2.3	2017-05-18 11:46:16 +02:00
Nicolas Lœuillet	abb0647cbd	Update Dockerfile to 2.2.3	2017-05-18 11:05:41 +02:00
Marvin Steadfast	6f22d1ef68	switched to alpine edge there are alot of php fixes in edge. alot of people have problems with php and older kernel versions to collect random data. also included a alpine upgrade command. this will prevent docker from building a wallabag image with older system files.	2017-05-09 08:59:37 +02:00
Marvin Steadfast	d1c050662b	added edge main repo to fix rabbitmq-c dep for php7-amqp	2017-03-22 11:24:05 +01:00
Marvin Steadfast	038a5ea6c7	`apk add` uses now the no-cache option	2017-03-22 11:13:30 +01:00
Marvin Steadfast	c42058bf0f	MariaDB default encoding utf8mb4 and maintenance * MariaDB encoding is set when creating DB through the entrypoint * Cleaning Dockerfile * Removed `POSTGRES_USER` * Combined run commands * Changed deprecated `MAINTAINER` to `LABEL`	2017-03-22 10:56:57 +01:00
Nicolas Lœuillet	3e4cd35253	Merge pull request #56 from wallabag/wllbg-222 Update Dockerfile with latest release	2017-03-08 10:00:11 +01:00
Nicolas Lœuillet	8c15693e12	Update Dockerfile with latest release	2017-03-02 15:49:19 +01:00
Marvin Steadfast	f6e4816eb5	provisioner function in entrypoint	2017-02-06 10:20:38 +01:00
Marvin Steadfast	bff2dd3d8b	using alpine 3.5 instead of edge	2017-02-06 10:20:38 +01:00
xsteadfastx	90265c1653	Merge pull request #48 from xsteadfastx/version-2.2.1 Version bumb to 2.2.1 and added migrate command	2017-02-01 11:07:51 +01:00
Marvin Steadfast	fb020c3be6	Version bumb to 2.2.1 and added migrate command made the changes to get 2.2.1 running plus added a migrate command to the entrypoint. documented it in the readme.	2017-01-31 16:33:19 +01:00
Jeremy Benoist	80a3379a76	Merge pull request #45 from janLo/import-worker Add option to run redis based import workers	2017-01-23 09:53:02 +01:00
Jeremy Benoist	5203ab63b1	Rename importer to import	2017-01-23 09:45:42 +01:00
Jan Losinski	65b2e2c7a9	Add documentation for the redis worker service Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>	2017-01-23 09:28:27 +01:00
Jan Losinski	4de27027b9	Add ability to run wannabag redis importer worker This adds the ability to run wallabag async import worker that interacts with a redis service. Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>	2017-01-23 09:28:27 +01:00
Jeremy Benoist	924d663c86	Merge pull request #46 from wallabag/dockerfile-216 Update Dockerfile for wallabag 2.1.6	2017-01-18 19:26:07 +01:00
Nicolas Lœuillet	ec8f599298	Update Dockerfile for wallabag 2.1.6	2017-01-18 10:44:17 +01:00
xsteadfastx	125aad2c1c	Merge pull request #43 from lotooo/master Add a POPULAtE_DATABASE env to use an existing wallabag DB	2017-01-18 09:40:29 +01:00
Jeremy Benoist	606b7d681c	Merge pull request #44 from janLo/php7-zlib Install php7-zlib	2017-01-18 09:35:50 +01:00
Jan Losinski	fdaaf37381	Install php7-zlib Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>	2017-01-17 15:40:58 +01:00
Matthieu Serrepuy	2b13ed0703	Add a POPULAtE_DATABASE env to use an existing wallabag DB	2017-01-16 22:44:43 +01:00
Marvin Steadfast	e41a237604	enabled zlib.output_compression in php.ini thanks to @itnAAnti. #40	2017-01-04 13:41:31 +01:00
xsteadfastx	724d6492bc	Merge pull request #42 from jsshandle/master Make entrypoint.sh executable in repository and remove related statement from Dockerfile.	2016-12-29 11:45:41 +01:00
jsshandle	267618a519	Make entrypoint.sh executable in repository and remove related statement from Dockerfile.	2016-12-26 18:59:30 +01:00
xsteadfastx	0fe227a0cc	Merge pull request #36 from jsshandle/master Add .s6-svscan/finish.	2016-11-28 12:27:22 +01:00
jsshandle	d42d34cdac	Add .s6-svscan/finish.	2016-11-26 20:35:51 +01:00
Nicolas Lœuillet	58cc845c75	Dockerfile for 2.1.5	2016-11-21 10:54:30 +01:00