Kanalak ez badu estekarik, erakutsi testu lauan esteka batean izan be…

…harrean
PasaiakoUdala · Aug 10, 2022 · 8490ac3 · 8490ac3
1 parent e791a9f
commit 8490ac3
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 11 deletions.
diff --git a/.env b/.env
@@ -5,6 +5,7 @@ DOCKER_MYSQL_DATABASE=zerbikat
 DOCKER_TIMEZONE="Europe/Madrid"
 PHP_IDE_CONFIG="serverName=zerbikat.test"
 XDEBUG_CONFIG="remote_host=192.168.2.8 remote_port=9000"
+WITH_XDEBUG=true
 USER_ID=1000
 GROUP_ID=1000
 ###< DOCKER ###
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@
 /web/doc/
 /.idea/Zerbikat.iml
 !/.env.local
+.env.local
diff --git a/Makefile b/Makefile
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+APP = zerbikar
+VERSION := $(shell cat ./VERSION)
+USER_ID = $(shell id -u)
+GROUP_ID= $(shell id -g)
+user==www-data
+
+help:
+	@echo 'Erabiltzeko: make [target]'
+	@echo
+	@echo 'Agindu erabilgarriak:'
+	@egrep '^(.+)\:\ ##\ (.+)' ${MAKEFILE_LIST} | column -t -c 2 -s ":#"
+
+build: ## Sortu Docker irudiak
+	docker compose --env-file .env.local build
+
+build-force: ## Sortu Docker irudiak aurrekoak ezabatzen (--force-rm --no-cache)
+	docker compose --env-file .env.local build --force-rm --no-cache
+
+restart: ## kontainerrak stop & start
+	$(MAKE) stop && $(MAKE) run
+
+run: ## kontenedorea abiarazi .env.local erabiliz
+	docker compose --env-file .env.local up -d
+
+stop: ## kontenedorea gelditu
+	docker compose down
+
+ssh: ## kontenedorera ssh sarbidea
+	docker compose exec php bash
+
+cc: ## symfony cache clear
+	docker compose exec php ./bin/console c:c
diff --git a/VERSION b/VERSION
diff --git a/app/Resources/views/fitxa/show.html.twig b/app/Resources/views/fitxa/show.html.twig
@@ -235,8 +235,11 @@
                                                         <a href='mailto:{{ kanal.estekaeu }}'>{{ kanal.izenaeu }}</a>
                                                         <br/>
                                                     {% else %}
-                                                        <a href='{{ kanal.estekaeu }}'
-                                                           target="_blank">{{ kanal.izenaeu }}</a><br/>
+                                                        {% if kanal.estekaeu is null %}
+                                                            {{ kanal.izenaeu }}
+                                                        {% else %}
+                                                            <a href='{{ kanal.estekaeu }}' target="_blank">{{ kanal.izenaeu }}</a><br/>
+                                                        {% endif %}
                                                     {% endif %}
                                                 {% endif %}
                                                 {% if kanal.eraikina %}{{ kanal.eraikina.izena }}<br/>{% endif %}
@@ -302,8 +305,11 @@
                                                         <a href='mailto:{{ kanal.estekaes }}'>{{ kanal.izenaes }}</a>
                                                         <br/>
                                                     {% else %}
-                                                        <a href='{{ kanal.estekaes }}'
-                                                           target="_blank">{{ kanal.izenaes }}</a><br/>
+                                                        {% if kanal.estekaes is null %}
+                                                            {{ kanal.izenaes }}
+                                                        {% else %}
+                                                            <a href='{{ kanal.izenaes }}' target="_blank">{{ kanal.izenaes }}</a><br/>
+                                                        {% endif %}
                                                     {% endif %}
                                                 {% endif %}
                                                 {% if kanal.eraikina %}{{ kanal.eraikina.izena }}<br/>{% endif %}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,29 +13,29 @@ services:
         ports:
             - "3306:3306"
         networks:
-            - zzoo
+            - zerbikatnet
     php:
         container_name: zerbikat-php
         env_file: ./.env
         build:
             context: .
             dockerfile: docker/php/Dockerfile
             args:
-                - WITH_XDEBUG=false
+                - WITH_XDEBUG=true
                 - DOCKER_TIMEZONE=${DOCKER_TIMEZONE}
                 - USER_ID=${USER_ID}
                 - GROUP_ID=${GROUP_ID}
         depends_on:
             - mariadb
         volumes:
             - '.:/usr/src/app'
-        user: 1000:1000
+        user: ${USER_ID}:${GROUP_ID}
         environment:
             - APP_ENV=dev
             - PHP_IDE_CONFIG=serverName=zerbikat.test
             - XDEBUG_CONFIG=remote_host=192.168.2.8
         networks:
-            - zzoo
+            - zerbikatnet
     nginx:
         container_name: zerbikat-nginx
         image: nginx:1.15.3-alpine
@@ -47,11 +47,11 @@ services:
         ports:
             - 80:80
         networks:
-            - zzoo
+            - zerbikatnet
 
 volumes:
     mariadb_zerbikat:
 
 networks:
-    zzoo:
+    zerbikatnet:
         driver: bridge
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -39,7 +39,8 @@ RUN apt-get update && apt-get install -y \
     && echo "LC_ALL=es_ES.UTF-8" >> /etc/default/locale \
     && echo "LANG=es_ES.UTF-8" >> /etc/default/locale
 
-RUN if [ "${WITH_XDEBUG}" = "true" ]; then pecl install xdebug && docker-php-ext-enable xdebug && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" >> /usr/local/etc/php/php.ini  && echo "error_reporting = E_ALL" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "display_startup_errors = On" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "display_errors = On" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "xdebug.remote_connect_back=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini ; fi
+RUN pecl install xdebug-2.5.5 && docker-php-ext-enable xdebug && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" >> /usr/local/etc/php/php.ini  && echo "error_reporting = E_ALL" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "display_startup_errors = On" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "display_errors = On" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && echo "xdebug.remote_connect_back=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
 
 RUN docker-php-ext-install pdo pdo_mysql