Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeroen-G authored Oct 2, 2023
1 parent 2372308 commit 8938554
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
tag: [ web7.3, web7.4, web8.0 ]
tag: [ web8.0, web8.1, web8.2 ]
env:
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
TAG: ${{ matrix.tag }}
Expand Down
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
A set of lightweight Docker images created with Laravel in mind, but work just as fine for other applications.
At the basis lies Alpine Linux and the amazing [Docker-Webstack](https://github.com/eXistenZNL/Docker-Webstack) which keeps the images that you pull in very small but usable.

The image sets you up with Alpine Linux, PHP-FPM, Nginx. Currently there is an image for PHP 7.3 7.4 and 8.0 available.
The image sets you up with Alpine Linux, PHP-FPM, Nginx. Currently there is an image for different PHP versions available.

## Installation
In the folder of your application create two files: `docker-compose.yml` and `Dockerfile` (note that the latter has no extension). On the command line, run `docker compose up -d --build` and view your containerized application at `localhost:80`.
Expand All @@ -26,7 +26,7 @@ services:
### Dockerfile
```Dockerfile
FROM jeroeng/alpine-artisan:web7.3
FROM jeroeng/alpine-artisan:web8.0
```

## Configuration
Expand Down Expand Up @@ -100,7 +100,7 @@ services:
Note: this only runs horizon locally using docker-compose. As soon as you want to host horizon in a container in the cloud, e.g. using kubernetes, you will have to build a separate image.

## Contributing
Clone this repository and run `make` to see which commands are there to help you. every command requires a `TAG=` parameter, which is the Docker image you want to build, for example: `make build TAG=web7.3`.
Clone this repository and run `make` to see which commands are there to help you. every command requires a `TAG=` parameter, which is the Docker image you want to build, for example: `make build TAG=web8.0`.

[link-docker-hub]: https://hub.docker.com/r/jeroeng/alpine-artisan
[ico-pulls]: https://img.shields.io/docker/pulls/jeroeng/alpine-artisan?style=flat-square
Expand Down
33 changes: 0 additions & 33 deletions web7.3.Dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions web7.4.Dockerfile

This file was deleted.

30 changes: 30 additions & 0 deletions web8.1.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM existenz/webstack:8.1

RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv; \
apk -U --no-cache add \
php8 \
php8-bcmath \
php8-curl \
php8-dom \
php8-exif \
php8-gd \
php8-iconv \
php8-intl \
php8-mbstring \
php8-pcntl \
php8-pdo_mysql \
php8-phar \
php8-posix \
php8-redis \
php8-session \
php8-xml \
php8-zip \
&& rm -rf /var/cache/apk/* \
&& ln -s /usr/bin/php8 /usr/bin/php

# See https://github.com/docker-library/php/issues/240
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php

COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

ONBUILD COPY --chown=php:nginx . /www
30 changes: 30 additions & 0 deletions web8.2.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM existenz/webstack:8.2

RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted gnu-libiconv; \
apk -U --no-cache add \
php8 \
php8-bcmath \
php8-curl \
php8-dom \
php8-exif \
php8-gd \
php8-iconv \
php8-intl \
php8-mbstring \
php8-pcntl \
php8-pdo_mysql \
php8-phar \
php8-posix \
php8-redis \
php8-session \
php8-xml \
php8-zip \
&& rm -rf /var/cache/apk/* \
&& ln -s /usr/bin/php8 /usr/bin/php

# See https://github.com/docker-library/php/issues/240
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php

COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

ONBUILD COPY --chown=php:nginx . /www

0 comments on commit 8938554

Please sign in to comment.