Skip to content

Fix to run on 2020 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rayrutjes merged 6 commits into from
Jan 18, 2020
Merged

Fix to run on 2020 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0208878
Fix package name after Ubuntu 16.04
Jan 18, 2020
a346bdf
Add gnupg installation
Jan 18, 2020
9966a8d
Fix blackfire gpg key repo
Jan 18, 2020
d66aac5
Update WP version in Dockerfile
Jan 18, 2020
2dd7223
Update WP version in Docker Compose
Jan 18, 2020
a804024
Fix Authentication plugin 'caching_sha2_password'
Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ COPY php.ini /usr/local/etc/php/
RUN a2enmod rewrite expires

# install the PHP extensions we need
RUN apt-get update && apt-get install -y wget libpng12-dev libjpeg-dev mysql-client nano less && rm -rf /var/lib/apt/lists/* \
RUN apt-get update && apt-get install -y wget libpng-dev libjpeg-dev gnupg mysql-client nano less && rm -rf /var/lib/apt/lists/* \
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
&& docker-php-ext-install gd mysqli

# blackfire agent
RUN wget -O - https://packagecloud.io/gpg.key | apt-key add -
RUN wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add -
RUN echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list
RUN apt-get update && apt-get install -y blackfire-agent blackfire-php

Expand All @@ -20,7 +20,7 @@ RUN curl -o /bin/wp https://github.com/ghraw/wp-cli/builds/gh-pages/pha
&& chmod +x /bin/wp \
&& wp --info --allow-root

ENV WP_VERSION 4.9.4
ENV WP_VERSION 5.3.2
ENV TZ Europe/Paris

COPY entrypoint.sh /entrypoint.sh
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ wordpress:
- ./wordpress:/var/www/html
dns: 208.67.222.222
environment:
WP_VERSION: 4.9.4
WP_VERSION: 5.3.2

db:
image: mysql:latest
image: mysql:5.7
environment:
MYSQL_ROOT_PASSWORD: password