Skip to content

Commit d21c32f

Browse files
authored
Merge pull request #63 from qdm12/docker-fix
Fix Docker build
2 parents 530d09a + e853919 commit d21c32f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ tests
1010
.styleci.yml
1111
.travis.yml
1212
changelog.md
13+
docker/README.md
1314
Dockerfile
1415
LICENSE
1516
README.md

Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ ARG PHP_VERSION=7.4-alpine${ALPINE_VERSION}
55
ARG COMPOSER_VERSION=2.1
66
ARG SUPERVISORD_VERSION=v0.7.3
77

8+
ARG UID=1000
9+
ARG GID=1000
10+
811
FROM --platform=${BUILDPLATFORM} composer:${COMPOSER_VERSION} AS build-composer
912
FROM composer:${COMPOSER_VERSION} AS composer
1013
FROM qmcgaw/binpot:supervisord-${SUPERVISORD_VERSION} AS supervisord
1114

1215
FROM --platform=${BUILDPLATFORM} php:${PHP_VERSION} AS vendor
16+
ARG UID=1000
17+
ARG GID=1000
1318
COPY --from=build-composer --chown=${UID}:${GID} /usr/bin/composer /usr/bin/composer
1419
RUN apk add --no-cache unzip
1520
WORKDIR /srv
@@ -26,7 +31,6 @@ RUN php artisan key:generate
2631
ENTRYPOINT [ "/srv/vendor/bin/phpunit" ]
2732

2833
FROM alpine:${ALPINE_VERSION}
29-
3034
ARG UID=1000
3135
ARG GID=1000
3236

0 commit comments

Comments
 (0)