-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
d1c0506
commit 6f22d1e
Showing
1 changed file
with
9 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
FROM alpine:3.5 | ||
FROM alpine:edge | ||
|
||
LABEL maintainer "Marvin Steadfast <[email protected]>" | ||
|
||
ARG WALLABAG_VERSION=2.2.2 | ||
|
||
RUN set -ex \ | ||
&& echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \ | ||
&& echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ | ||
&& apk add --no-cache \ | ||
&& apk update \ | ||
&& apk upgrade --available \ | ||
&& apk add \ | ||
ansible \ | ||
curl \ | ||
git \ | ||
|
@@ -16,7 +16,7 @@ RUN set -ex \ | |
nginx \ | ||
pcre \ | ||
php7 \ | ||
php7-amqp@testing \ | ||
php7-amqp \ | ||
php7-bcmath \ | ||
php7-ctype \ | ||
php7-curl \ | ||
|
@@ -33,16 +33,17 @@ RUN set -ex \ | |
php7-pdo_sqlite \ | ||
php7-phar \ | ||
php7-session \ | ||
php7-simplexml \ | ||
php7-tokenizer \ | ||
php7-xml \ | ||
php7-zlib \ | ||
php7\ | ||
py-mysqldb \ | ||
py-psycopg2 \ | ||
py-simplejson \ | ||
rabbitmq-c@edge \ | ||
rabbitmq-c \ | ||
s6 \ | ||
tar \ | ||
&& 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 \ | ||
&& curl -s http://getcomposer.org/installer | php \ | ||
|
6f22d1e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should go back to a tagged version by now?