From: Vincent Vanwaelscappel Date: Tue, 25 Mar 2025 16:30:22 +0000 (+0100) Subject: wip #7378 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0968ff171998cfd58ff5ae923c585c2dd31f3737;p=dtlc.git wip #7378 @1 --- diff --git a/.docker/build b/.docker/build new file mode 100644 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 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 c68068d..5495b33 100644 --- 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 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 29ce74d..5426f83 100644 --- 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 ecf0153..acfc4cc 100644 --- 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 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 7e76b26..763a093 100644 --- 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 b954c62..aa55734 100644 --- 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