From 41d17b4b4ecaf97d738025432f8e5786d34c70b6 Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Fri, 29 Sep 2023 14:45:05 +0200
Subject: [PATCH] adjustments

---
 .docker/docker-compose.yml |  9 ++++-----
 README.md                  | 10 +++++-----
 src/index.php              |  2 --
 3 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 src/index.php

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 2259051..549236c 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -4,9 +4,9 @@ name: spt-magento
 services:
   mariadb:
     image: mariadb:10.4
-    container_name: mariadb-10.4
+    container_name: mariadb
     ports:
-      - "3401:3306"
+      - "3306:3306"
     environment:
       # think about .env file here
       MYSQL_ROOT_PASSWORD: root
@@ -20,7 +20,7 @@ services:
       context: .
       dockerfile: Dockerfile
     image: 'php81_apache'
-    container_name: php-8.1-apache
+    container_name: php-apache
     environment:
       - "APACHE_LOG_DIR:/src"
     ports:
@@ -36,7 +36,6 @@ services:
       - elasticsearch
   elasticsearch:
     image: docker.io/bitnami/elasticsearch:7
-    container_name: elasticsearch7
     volumes:
       - ./../.elasticsearch:/bitnami/elasticsearch/data'
   phpmyadmin:
@@ -44,7 +43,7 @@ services:
     container_name: phpmyadmin
     restart: always
     ports:
-      - "8102:80"
+      - "81:80"
     environment:
       - PMA_ARBITRARY=1
     networks:
diff --git a/README.md b/README.md
index 41c780e..1209593 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,13 @@
 - `docker-compose down`
 
 # Remove image
-- `docker image rm php81_apache`
+- `docker image rm php_apache`
 
 # Stop containers, remove image and recreation of container
-- `docker-compose down && docker image rm php81_apache && docker-compose up -d`
+- `docker-compose down && docker image rm php_apache && docker-compose up -d`
 
 # Get into container
-- `docker exec -it php-8.1-apache /bin/bash`
+- `docker exec -it php-apache /bin/bash`
 
 
 - `docker build -t magento-php .`
@@ -49,7 +49,7 @@
 - composer install
 - "bin/magento install" Befehl:
   php bin/magento setup:install --base-url="http://127.0.0.1" \
-  --db-host="magento-mariadb" \
+  --db-host="mariadb" \
   --db-name="magento" \
   --db-user="root" \
   --db-password="root" \
@@ -60,7 +60,7 @@
   --admin-password="magento2test" \
   --use-rewrites="1" \
   --backend-frontname="admin" \
-  --db-prefix=mage_ \
+  --db-prefix="" \
   --search-engine=elasticsearch7 \
   --elasticsearch-host=elasticsearch \
   --elasticsearch-port=9200
diff --git a/src/index.php b/src/index.php
deleted file mode 100644
index 19339d9..0000000
--- a/src/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-    echo 'hello world';