Skip to content
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

Base on official PHP 7.0 Alpine image #21

Closed
wants to merge 9 commits into from
Closed

Base on official PHP 7.0 Alpine image #21

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
970a70d
#16 php 7.0 support
kusmierz Apr 10, 2016
e6f58f2
Little bit fixes (https and Tini is now higher, so it should be faste…
kusmierz Apr 11, 2016
0fb8d51
Update Dockerfile
kusmierz Apr 11, 2016
dc87315
Smaller image
kusmierz May 30, 2016
8601a8a
Tini has been relocated to /sbin/tini.
kusmierz Jun 1, 2016
48274b8
#21 Downloading "latest" adminer instead tagged one (see #5)
kusmierz Jun 8, 2016
7d58a98
Merge branch 'feature/16-alpine-php70' of github.com:kusmierz/docker-…
kusmierz Jun 8, 2016
72ac62b
Small fixes (@mathroc comments)
kusmierz Sep 5, 2016
749192d
#15 #16 ODBC dirty fix
kusmierz Sep 5, 2016
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
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ RUN set -x \
&& ./configure --with-unixODBC=shared,/usr \
&& docker-php-ext-install odbc

## Add Tini
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ tini
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alpine version of official php images has been upgraded and it includes tini in the defauls packages list now. no need for the custom repository anymore (might even not work anymore)

Copy link
Author

@kusmierz kusmierz Sep 5, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I've seen it before, but had no time to update it. Thanks.

ENTRYPOINT ["/usr/bin/tini", "--"]

## Add the files
ADD php.ini /usr/local/etc/php/conf.d/php.ini

## install adminer and default theme
ENV ADMINER_VERSION 4.2.4
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it better download "latest" or having const with version?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kusmierz See the discussion here: #5

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks @mikehaertl I knew I've seen it somewhere :)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is some discussion about this in #5, however until we get to solve this I would vote to not introduce any additional changes in this PR 👍 (In other words, revert this change and)

After all, this PR ought to be about Alpine, right? :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.


RUN mkdir -p /var/www
ADD https://www.adminer.org/static/download/$ADMINER_VERSION/adminer-$ADMINER_VERSION.php /var/www/index.php
ADD http://www.adminer.org/static/download/$ADMINER_VERSION/adminer-$ADMINER_VERSION.php /var/www/index.php
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the change to https ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By mistake, I've reverted it in e6f58f2

ADD https://raw.github.com/vrana/adminer/master/designs/hever/adminer.css /var/www/adminer.css
RUN chown www-data:www-data -R /var/www

## Add Tini
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ tini
ENTRYPOINT ["/usr/bin/tini", "--"]

## Expose the port
EXPOSE 80

Expand Down