public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-13 09:46:27 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: public:2.2.1
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1
...
compare: public:2.2.3
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1

10 Commits
2.2.1 ... 2.2.3

Author SHA1 Message Date
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
4 changed files with 53 additions and 42 deletions
Expand all files Collapse all files

76
Dockerfile
View File

@@ -1,61 +1,61 @@
FROM alpine:edge
MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org>
ARG WALLABAG_VERSION=2.2.1
ARG 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.2.3
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-zlib@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 http://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 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"]

2
README.md
View File

@@ -91,7 +91,7 @@ $ docker exec -t NAME_OR_ID_OF_YOUR_WALLABAG_CONTAINER /var/www/wallabag/bin/con
It's a good way to use [docker-compose](https://docs.docker.com/compose/). Example:
```
version: '2'
version: '3'
services:
wallabag:
image: wallabag/wallabag

16
root/entrypoint.sh
View File

@@ -1,16 +1,26 @@
#!/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
ansible-playbook -i /etc/ansible/hosts /etc/ansible/entrypoint.yml -c local --skip-tags=firstrun
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
ansible-playbook -i /etc/ansible/hosts /etc/ansible/entrypoint.yml -c local
provisioner
cd /var/www/wallabag/
exec su -c "bin/console doctrine:migrations:migrate --env=prod --no-interaction" -s /bin/sh nobody
fi

1
root/etc/ansible/entrypoint.yml
View File

@@ -70,6 +70,7 @@
login_port={{ database_port }}
login_user=root
login_password="{{ database_root_password_mariadb }}"
encoding="utf8mb4"
notify: run install
when: (database_driver == 'pdo_mysql') and
(populate_database == True)