Skip to content

Commit

Permalink
Merge pull request #815 from StefanSchoof/officialimage
Browse files Browse the repository at this point in the history
Use official php docker images as base
  • Loading branch information
andig authored Aug 8, 2020
2 parents 0e82505 + 8aa92da commit 778c44d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) 2019 Andreas Goetz <[email protected]>

FROM jorge07/alpine-php:7.3-dev AS builder
FROM composer:1 AS builder

WORKDIR /vz

Expand All @@ -11,16 +11,18 @@ RUN composer install --no-ansi --no-scripts --no-dev --no-interaction --no-progr
COPY . /vz


FROM jorge07/alpine-php:7.3
FROM php:7.3-alpine

EXPOSE 8080
EXPOSE 8082
EXPOSE 5582

RUN docker-php-ext-install pcntl pdo_mysql

COPY --from=builder /vz /vz
COPY --from=builder /vz/etc/config.dist.yaml /vz/etc/config.yaml

# modify options.js
RUN sed -i "s/url: 'api'/url: '',/" /vz/htdocs/js/options.js

CMD /vz/vendor/bin/ppm start -c /vz/etc/middleware.json --static-directory /vz/htdocs --cgi-path=/usr/bin/php
CMD /vz/vendor/bin/ppm start -c /vz/etc/middleware.json --static-directory /vz/htdocs --cgi-path=/usr/local/bin/php
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
sed -i s/vz_admin/root/ /vz/etc/config.yaml &&
sleep 1 &&
(/vz/bin/doctrine orm:schema-tool:update --force || /vz/bin/doctrine orm:schema-tool:create) &&
/vz/vendor/bin/ppm start -c /vz/etc/middleware.json --static-directory /vz/htdocs --cgi-path=/usr/bin/php"
/vz/vendor/bin/ppm start -c /vz/etc/middleware.json --static-directory /vz/htdocs --cgi-path=/usr/local/bin/php"
links:
- database
depends_on:
Expand Down

0 comments on commit 778c44d

Please sign in to comment.