wip #7378 @1

diff --git a/.docker/build b/.docker/build
new file mode 100644 (file)
index 0000000..379f415
--- /dev/null
+++ b/.docker/build
@@ -0,0 +1,3 @@
+#!/bin/sh
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build

diff --git a/.docker/dev/build b/.docker/dev/build
deleted file mode 100644 (file)
index 379f415..0000000
--- a/.docker/dev/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index c68068d8c568395a3a5b03655af8476c33d934a5..5495b3393cb3b2ca6f156c5b4f1376eae773d3aa 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -1,4 +1,5 @@
 services:
+
   webserver:
     container_name: dtlc-dev-httpd
     build: './images/httpd'
@@ -14,6 +15,7 @@ services:
       - dtlc-dev
       - nginxproxy
     restart: unless-stopped
+
   php-fpm:
     container_name: dtlc-dev
     hostname: dtlc-dev
@@ -98,8 +100,9 @@ services:
 
 networks:
   dtlc-dev:
-    external:
-      name: dtlc-dev
+    name: dtlc-dev
+    external: true
+
   nginxproxy:
     name: nginxproxy
     external: true

diff --git a/.docker/dev/dockerterminal.bat b/.docker/dev/dockerterminal.bat
new file mode 100644 (file)
index 0000000..36a21fa
--- /dev/null
+++ b/.docker/dev/dockerterminal.bat
@@ -0,0 +1,3 @@
+@echo off
+cls
+ssh -t root@cloudatlas.cubedesigners.com 'docker exec -it -u dtlc dtlc-dev /bin/bash'

diff --git a/.docker/dev/passwords b/.docker/dev/passwords
index 29ce74df920164605747cbf8edca248745ba08d9..5426f83f4ff49b60b56078099647089f14d19c63 100644 (file)
--- a/.docker/dev/passwords
+++ b/.docker/dev/passwords
@@ -1 +1 @@
-dtlc-dev:ll7qABi0zXbRKImt
\ No newline at end of file
+dtlc:ll7qABi0zXbRKImt
\ No newline at end of file

diff --git a/.docker/dev/update b/.docker/dev/update
index ecf01538fba75e64eb91dfd6298806cc54337d66..acfc4cc458cdae856e213a4892062271ead5e336 100644 (file)
--- a/.docker/dev/update
+++ b/.docker/dev/update
@@ -10,3 +10,5 @@ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 
 docker compose down -v
 docker compose up -d
+
+ufw-docker allow dtlc-dev
\ No newline at end of file

diff --git a/.docker/production/build b/.docker/production/build
deleted file mode 100644 (file)
index 379f415..0000000
--- a/.docker/production/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
-COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build

diff --git a/.docker/production/update b/.docker/production/update
index 7e76b26261144f86dec57bf18f0d39029ac725da..763a093052e4274293b60f2fdd5659ad7747e775 100644 (file)
--- a/.docker/production/update
+++ b/.docker/production/update
@@ -10,3 +10,5 @@ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 
 docker compose down -v
 docker compose up -d
+
+ufw-docker allow dtlc
\ No newline at end of file

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index b954c62302deeea428c735efadc3fa7a50d7b1fc..aa557347e63feaf9f2e40cd35d9e3f178d727c42 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -69,7 +69,7 @@ sogecommerce.key = gLAsQjFhDOBFPXBH
 [testing : production]
 seo.robots = false
 
-dev = false
+dev = true
 firephp = false
 
 httpauth.username = dtlc