public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-15 18:56:29 +00:00
Code Issues Releases Wiki Activity

MariaDB default encoding utf8mb4 and maintenance

Browse Source 
* MariaDB encoding is set when creating DB through the entrypoint
* Cleaning Dockerfile
  * Removed `POSTGRES_USER`
  * Combined run commands
  * Changed deprecated `MAINTAINER` to `LABEL`
This commit is contained in:
Marvin Steadfast
2017-02-20 12:38:51 +01:00
parent 3e4cd35253
commit c42058bf0f
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Dockerfile
View File

@@ -1,8 +1,8 @@
FROM alpine:3.5 FROM alpine:3.5
MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org>
LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>"
ARG WALLABAG_VERSION=2.2.2 ARG WALLABAG_VERSION=2.2.2
ARG POSTGRES_USER=postgres
RUN set -ex \ RUN set -ex \
&& echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
@@ -41,23 +41,19 @@ RUN set -ex \
py-simplejson \ py-simplejson \
s6 \ s6 \
tar \ tar \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/* \
&& ln -s /usr/bin/php7 /usr/bin/php \
RUN ln -s /usr/bin/php7 /usr/bin/php \
&& ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log && ln -sf /dev/stderr /var/log/nginx/error.log \
&& curl -s http://getcomposer.org/installer | php \
RUN curl -s http://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer \
&& mv composer.phar /usr/local/bin/composer && git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag
RUN git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag
COPY root / COPY root /
RUN cd /var/www/wallabag \ RUN cd /var/www/wallabag \
&& SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist && SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist \
&& chown -R nobody:nobody /var/www/wallabag
RUN chown -R nobody:nobody /var/www/wallabag
EXPOSE 80 EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"] 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: It's a good way to use [docker-compose](https://docs.docker.com/compose/). Example:
``` ```
version: '2' version: '3'
services: services:
wallabag: wallabag:
image: wallabag/wallabag image: wallabag/wallabag

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

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