Updated environment and ci.

Author: DKravtsov

.dockerignore

@@ -8,4 +8,4 @@
 /vendor/
 
 Dockerfile
-docker-compose.yml
+compose.yaml

.editorconfig

@@ -1,3 +1,4 @@
+# EditorConfig is awesome: http://EditorConfig.org
 root = true
 
 [*]

.github/workflows/ci.yml

@@ -13,28 +13,23 @@ on:
         types: [published]
 
 jobs:
-
     build:
-
         runs-on: ubuntu-latest
-
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Build the docker images
               run: make build
             - name: Start the docker images
               run: make start
             - name: Check running containers
               run: docker ps -a
-            - name: Test bundle with Symfony 4
-              run: make test-using-symfony-4
-            - name: Display information
-              run: make info
-            - name: Test bundle with Symfony 5
-              run: make test-using-symfony-5
             - name: Test bundle with Symfony 6
               run: make test-using-symfony-6
             - name: Display information
               run: make info
+            - name: Test bundle with Symfony 7
+              run: make test-using-symfony-7
+            - name: Display information
+              run: make info
             - name: Stop the docker images
               run: make stop

Dockerfile

@@ -1,4 +1,5 @@
-FROM php:8.1-fpm
+# syntax=docker/dockerfile:1.7-labs
+FROM php:8.4-fpm
 
 # set main params
 ARG BUILD_ARGUMENT_ENV=dev
@@ -27,7 +28,10 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       libxml2 \
       libxml2-dev \
       libreadline-dev \
+      sudo \
       libzip-dev \
+      wget \
+      debsecan \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
     && docker-php-ext-configure intl \
     && docker-php-ext-install \
@@ -36,6 +40,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       intl \
       opcache \
       zip \
+    && apt-get install --no-install-recommends -y \
+        $(debsecan --suite bookworm --format packages --only-fixed) \
     && rm -rf /tmp/* \
     && rm -rf /var/list/apt/* \
     && rm -rf /var/lib/apt/lists/* \

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Dmitriy Kravtsov
+Copyright (c) Dmitriy Kravtsov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,7 +1,7 @@
 ifndef INSIDE_DOCKER_CONTAINER
 	INSIDE_DOCKER_CONTAINER = 0
 endif
-export COMPOSE_PROJECT_NAME=easy_log_bundle
+export COMPOSE_PROJECT_NAME=easy-log-bundle
 HOST_UID := $(shell id -u)
 HOST_GID := $(shell id -g)
 PHP_USER := -u www-data
@@ -14,21 +14,21 @@ endif
 
 build:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml build
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose -f compose.yaml build
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
 start:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml $(PROJECT_NAME) up -d
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose -f compose.yaml $(PROJECT_NAME) up -d
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
 stop:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose -f docker-compose.yml $(PROJECT_NAME) down
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose -f compose.yaml $(PROJECT_NAME) down
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
@@ -37,21 +37,21 @@ restart: stop start
 
 ssh:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
 ssh-root:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose $(PROJECT_NAME) exec $(OPTION_T) symfony bash
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
 ssh-nginx:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec nginx /bin/sh
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose $(PROJECT_NAME) exec nginx /bin/sh
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
@@ -60,40 +60,35 @@ exec:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
 	@$$cmd
 else
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony $$cmd
 endif
 
 exec-bash:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
 	@bash -c "$(cmd)"
 else
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony bash -c "$(cmd)"
 endif
 
 exec-by-root:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker-compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
+	@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) docker compose $(PROJECT_NAME) exec $(OPTION_T) symfony $$cmd
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
-test-using-symfony-4:
-	@make clean
-	@make exec-bash cmd="composer create-project symfony/website-skeleton . ^4.4"
-	@make transfer-monolog-config
-	@make install-bundle
-	@make cache-clear-warmup
-
-test-using-symfony-5:
+test-using-symfony-6:
 	@make clean
-	@make exec-bash cmd="composer create-project symfony/website-skeleton . ^5.0"
+	@make exec-bash cmd="composer create-project symfony/skeleton:'6.4.x' ."
+	@make exec-bash cmd="composer require webapp --no-interaction"
 	@make transfer-monolog-config
 	@make install-bundle
 	@make cache-clear-warmup
 
-test-using-symfony-6:
+test-using-symfony-7:
 	@make clean
-	@make exec-bash cmd="composer create-project symfony/website-skeleton . ^6.0"
+	@make exec-bash cmd="composer create-project symfony/skeleton:'7.2.x' ."
+	@make exec-bash cmd="composer require webapp --no-interaction"
 	@make transfer-monolog-config
 	@make install-bundle
 	@make cache-clear-warmup
@@ -119,14 +114,14 @@ info:
 
 logs:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@docker logs -f ${COMPOSE_PROJECT_NAME}_symfony
+	@docker logs -f ${COMPOSE_PROJECT_NAME}-symfony
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif
 
 logs-nginx:
 ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
-	@docker logs -f ${COMPOSE_PROJECT_NAME}_nginx
+	@docker logs -f ${COMPOSE_PROJECT_NAME}-nginx
 else
 	$(ERROR_ONLY_FOR_HOST)
 endif

docker-compose.yml renamed to compose.yaml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
     nginx:
@@ -9,7 +7,7 @@ services:
         args:
           BUILD_ARGUMENT_ENV: dev
         dockerfile: ./nginx/Dockerfile
-      container_name: ${COMPOSE_PROJECT_NAME}_nginx
+      container_name: ${COMPOSE_PROJECT_NAME}-nginx
       restart: always
       ports:
         - "80:80"
@@ -30,7 +28,7 @@ services:
           HOST_UID: ${HOST_UID}
           HOST_GID: ${HOST_GID}
         dockerfile: ./Dockerfile
-      container_name: ${COMPOSE_PROJECT_NAME}_symfony
+      container_name: ${COMPOSE_PROJECT_NAME}-symfony
       expose:
         - 9000
       volumes:

composer.json

@@ -20,7 +20,7 @@
 		},
 		{
 			"name": "Dmitriy Kravtsov",
-			"email": "dmitriy[email protected]"
+			"email": "dmytro[email protected]"
 		}
 	],
 	"conflict": {