ajustes Makefile

Author: rpmeir

.docker/.env

@@ -21,15 +21,15 @@ APP_CODE_PATH_CONTAINER=/var/www/current
 APP_HOST=standard-php-dev-env.local
 
 # nginx
-NGINX_HOST_HTTP_PORT=8898
-NGINX_HOST_HTTPS_PORT=8899
+NGINX_HOST_HTTP_PORT=8082
+NGINX_HOST_HTTPS_PORT=8445
 
 # php-cli
-WORKSPACE_HOST_SSH_PORT=2239
+WORKSPACE_HOST_SSH_PORT=2224
 
 # mysql
 MYSQL_ROOT_PASSWORD=S3cr3T
 MYSQL_DATABASE=test
 MYSQL_USER=dba
 MYSQL_PASSWORD=S3cr3T
-MYSQL_HOST_PORT=6089
+MYSQL_HOST_PORT=6035

.docker/docker-compose.yml

@@ -5,7 +5,7 @@ networks:
     driver: ${NETWORKS_DRIVER}
     ipam:
       config:
-        - subnet: "192.168.230.0/24"
+        - subnet: "192.168.203.0/24"
 
 volumes:
   data-spde:
@@ -30,7 +30,7 @@ services:
       - "${NGINX_HOST_HTTPS_PORT}:443"
     networks:
       backend:
-        ipv4_address: 192.168.230.13
+        ipv4_address: 192.168.203.13
         aliases:
           - ${APP_HOST}
 
@@ -51,7 +51,7 @@ services:
       - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
     networks:
       backend:
-        ipv4_address: 192.168.230.12
+        ipv4_address: 192.168.203.12
 
   php-cli:
     image: standard-php-dev-env/php-cli
@@ -72,7 +72,7 @@ services:
       - "${WORKSPACE_HOST_SSH_PORT}:22"
     networks:
       backend:
-        ipv4_address: 192.168.230.11
+        ipv4_address: 192.168.203.11
 
   mysql:
     image: standard-php-dev-env/mysql
@@ -85,7 +85,7 @@ services:
       - ./mysql/init_data:/docker-entrypoint-initdb.d
     networks:
       backend:
-        ipv4_address: 192.168.230.10
+        ipv4_address: 192.168.203.10
     ports:
       - ${MYSQL_HOST_PORT}:3306
     environment:

.docker/nginx/Dockerfile

@@ -45,4 +45,4 @@ RUN /tmp/scripts/cleanup.sh
 
 CMD ["nginx"]
 
-EXPOSE 8898 8899
+EXPOSE 8083 8445

Makefile

@@ -1,6 +1,6 @@
 DOCKER_COMPOSE_DIR=./.docker
 DOCKER_COMPOSE_FILE=$(DOCKER_COMPOSE_DIR)/docker-compose.yml
-DEFAULT_CONTAINER=workspace
+DEFAULT_CONTAINER=php-cli
 DOCKER_COMPOSE=docker-compose -f $(DOCKER_COMPOSE_FILE) --project-directory $(DOCKER_COMPOSE_DIR)
 
 DEFAULT_GOAL := help
@@ -47,4 +47,4 @@ docker-down: docker-init ## Stop all docker containers. To only stop one contain
 
 .PHONY: docker-ipaddress
 docker-ipaddress: ## Get IP address of all containers.
-	docker network inspect -f '{{json .Containers}}' filipets-docker_backend | jq '.[] | .Name + ":" + .IPv4Address'
+	docker network inspect -f '{{json .Containers}}' standard-php-dev-env_backend | jq '.[] | .Name + ":" + .IPv4Address'