Skip to content

Commit

Permalink
Update dev-docker setup
Browse files Browse the repository at this point in the history
  • Loading branch information
antonkomarev committed Mar 5, 2024
1 parent 25c7233 commit f60dcce
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 151 deletions.
40 changes: 0 additions & 40 deletions .docker/nginx/app.laravel-ban.80.conf

This file was deleted.

5 changes: 4 additions & 1 deletion .docker/php/Dockerfile → .docker/php/php81/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# ----------------------
# The FPM base container
# ----------------------
FROM php:8.1-fpm-alpine AS dev
FROM php:8.1-cli-alpine AS dev

RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS

# Cleanup apk cache and temp files
RUN rm -rf /var/cache/apk/* /tmp/*
Expand Down
22 changes: 22 additions & 0 deletions .docker/php/php82/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# ----------------------
# The FPM base container
# ----------------------
FROM php:8.2-cli-alpine AS dev

RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS

# Cleanup apk cache and temp files
RUN rm -rf /var/cache/apk/* /tmp/*

# ----------------------
# Composer install step
# ----------------------

# Get latest Composer
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

# ----------------------
# The FPM production container
# ----------------------
FROM dev
22 changes: 22 additions & 0 deletions .docker/php/php83/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# ----------------------
# The FPM base container
# ----------------------
FROM php:8.3-cli-alpine AS dev

RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS

# Cleanup apk cache and temp files
RUN rm -rf /var/cache/apk/* /tmp/*

# ----------------------
# Composer install step
# ----------------------

# Get latest Composer
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

# ----------------------
# The FPM production container
# ----------------------
FROM dev
85 changes: 0 additions & 85 deletions .docker/php/www.conf

This file was deleted.

49 changes: 24 additions & 25 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
version: "3.9"
services:
app:
container_name: laravel-ban-app
image: laravel-ban-app
php81:
container_name: laravel-ban-lib-81
image: laravel-ban-lib-81
build:
context: ./
dockerfile: ./.docker/php/Dockerfile
restart: unless-stopped
dockerfile: ./.docker/php/php81/Dockerfile
tty: true
working_dir: /app
volumes:
- ./:/app
- ./.docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
networks:
- laravel-ban

nginx:
container_name: laravel-ban-nginx
image: nginx:1.21-alpine
restart: unless-stopped
depends_on:
- app
ports:
- "80:80"
environment:
VIRTUAL_HOST: app.laravel-ban.localhost
php82:
container_name: laravel-ban-lib-82
image: laravel-ban-lib-82
build:
context: ./
dockerfile: ./.docker/php/php82/Dockerfile
tty: true
working_dir: /app
volumes:
- ./.docker/nginx/app.laravel-ban.80.conf:/etc/nginx/conf.d/app.laravel-ban.80.conf:ro
- ./public:/app/public:ro
networks:
- laravel-ban
- ./:/app

networks:
laravel-ban:
driver: bridge
php83:
container_name: laravel-ban-lib-83
image: laravel-ban-lib-83
build:
context: ./
dockerfile: ./.docker/php/php83/Dockerfile
tty: true
working_dir: /app
volumes:
- ./:/app

0 comments on commit f60dcce

Please sign in to comment.