Daniel пре 3 година
родитељ
комит
9551f9e214
12 измењених фајлова са 918316 додато и 12 уклоњено
  1. +54
    -0
      .docker/Dockerfile
  2. +40
    -0
      .docker/docker-compose.yml
  3. +72
    -0
      .docker/dump/tb_admin.sql
  4. +33517
    -0
      .docker/dump/tb_core.sql
  5. +884565
    -0
      .docker/dump/tb_teamdata.sql
  6. +19
    -0
      .docker/init.sh
  7. +4
    -0
      .gitignore
  8. +29
    -0
      README.md
  9. +4
    -4
      apps/teambuddy/src/admin/config/boot_local.php
  10. +3
    -2
      apps/teambuddy/src/client/config/boot_local.php
  11. +6
    -6
      apps/teambuddy/src/server/config/boot_local.php
  12. +3
    -0
      pw_gen.php

+ 54
- 0
.docker/Dockerfile Прегледај датотеку

@@ -0,0 +1,54 @@
#FROM php:8.1-apache
FROM php:7.4-apache

ENV APACHE_DOCUMENT_ROOT /var/www/html/apps/teambuddy/public
ENV APACHE_SERVER_NAME localhost
ENV PATH="$PATH"
WORKDIR /var/www/html

RUN apt-get update

RUN apt-get install -y \
libfreetype6-dev \
libjpeg62-turbo-dev \
libpng-dev \
libicu-dev \
&& docker-php-ext-install -j$(nproc) iconv \
&& docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-freetype=/usr/include/ \
&& docker-php-ext-install -j$(nproc) gd \
&& docker-php-ext-install -j$(nproc) intl \
&& docker-php-ext-install -j$(nproc) pdo_mysql

RUN apt-get install -y git zip

RUN apt install nano

RUN pecl install xdebug \
&& docker-php-ext-enable xdebug \
&& echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo "xdebug.client_host = host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo 'xdebug.discover_client_host=1' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo 'xdebug.log=/var/www/var/log/xdebug.log' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& echo 'xdebug.log_level=0' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

RUN a2enmod rewrite && a2enmod headers
RUN a2ensite 000-default

COPY ./ /var/www/html

RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf


RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"

RUN chown -R www-data:www-data /var/www/html/

COPY /init.sh /init.sh
RUN chmod 755 /init.sh
RUN chmod +x /init.sh
EXPOSE 80

ENTRYPOINT ["/init.sh"]
CMD ["apache2-foreground"]

+ 40
- 0
.docker/docker-compose.yml Прегледај датотеку

@@ -0,0 +1,40 @@
version: '3.7'

services:
database:
image: mariadb
container_name: tb-con-mariadb
ports:
- "3399:3306"
environment:
# think about .env file here
MYSQL_ROOT_PASSWORD: root
volumes:
- ./../.db:/var/lib/mysql
restart: always
networks:
- default
tbuddy:
build:
context: ./
dockerfile: Dockerfile
image: 'tb_spt_image'
container_name: tb-con-tbuddy
ports:
- '8099:80'
volumes:
- ./../:/var/www/html
networks:
- default
phpmyadmin:
image: phpmyadmin
container_name: tb-con-phpmyadmin
restart: always
ports:
- "8098:80"
environment:
- PMA_ARBITRARY=1
networks:
- default
networks:
default:

+ 72
- 0
.docker/dump/tb_admin.sql Прегледај датотеку

@@ -0,0 +1,72 @@
-- phpMyAdmin SQL Dump
-- version 4.9.7
-- https://www.phpmyadmin.net/
--
-- Host: localhost
-- Erstellungszeit: 10. Aug 2022 um 16:30
-- Server-Version: 10.5.16-MariaDB-1:10.5.16+maria~focal-log
-- PHP-Version: 7.4.30

SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
SET AUTOCOMMIT = 0;
START TRANSACTION;
SET time_zone = "+00:00";


/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8mb4 */;

--
-- Datenbank: `d0287fb8`
--

-- --------------------------------------------------------

--
-- Tabellenstruktur für Tabelle `account`
--

CREATE TABLE `account` (
`id` int(11) NOT NULL,
`credential` varchar(255) NOT NULL,
`pass` varchar(32) NOT NULL,
`created` datetime NOT NULL,
`last_update` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE current_timestamp()
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Daten für Tabelle `account`
--

INSERT INTO `account` (`id`, `credential`, `pass`, `created`, `last_update`) VALUES
(1, 'benny@tbuddy.de', '07cd929309703b97e7e668763122ffbf', '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
(2, 'timo@tbuddy.de', '96915237c1fe9c318b5216954f7fc028', '0000-00-00 00:00:00', '0000-00-00 00:00:00');

--
-- Indizes der exportierten Tabellen
--

--
-- Indizes für die Tabelle `account`
--
ALTER TABLE `account`
ADD PRIMARY KEY (`id`),
ADD UNIQUE KEY `id` (`id`),
ADD KEY `id_2` (`id`);

--
-- AUTO_INCREMENT für exportierte Tabellen
--

--
-- AUTO_INCREMENT für Tabelle `account`
--
ALTER TABLE `account`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
COMMIT;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

+ 33517
- 0
.docker/dump/tb_core.sql
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 884565
- 0
.docker/dump/tb_teamdata.sql
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 19
- 0
.docker/init.sh Прегледај датотеку

@@ -0,0 +1,19 @@
#!/bin/sh

echo "create log files"

#su www-data -s /bin/bash -c "mkdir /var/www/html/temp"
#su www-data -s /bin/bash -c "mkdir /var/www/html/logs"
#su www-data -s /bin/bash -c "cd /var/www/html/logs"
#su www-data -s /bin/bash -c "touch tbserver-log.txt"
#su www-data -s /bin/bash -c "touch tbserver-cron-log.txt"

su www-data -s /bin/bash
mkdir /var/www/html/temp
mkdir /var/www/html/logs
cd /var/www/html/logs
touch tbserver-log.txt
touch tbserver-cron-log.txt

echo "$@"
docker-php-entrypoint "$@"

+ 4
- 0
.gitignore Прегледај датотеку

@@ -0,0 +1,4 @@
/.idea/
/.db/
/logs/
/temp/

+ 29
- 0
README.md Прегледај датотеку

@@ -0,0 +1,29 @@
# contao-docker-test

#Installation:

# Some important information

# Some helpful docker commands:
- `docker-compose up -d`
- `docker-compose down`
- `docker exec -it tb-con-tbuddy /bin/bash`
- `docker build -t tb-con-tbuddy .`
- `docker image rm tb_spt_image`
- `docker ps`
- `docker ps --all`
- `docker container stop $(docker container ls -aq)`
- `docker container rm $(docker container ls -aq)`
- `docker rmi $(docker images -q)`
- `docker stop spt_tbuddy && docker rm spt_tbuddy && docker rmi spt_tb && docker-compose up -d`

# Some helpful other commands:
- Restart Apache within the container
- Go into docker container `docker exec -it spt_tbuddy /bin/bash`
- Apache restart `sudo /etc/init.d/apache2 reload`

# Clean restart of Docker instance
1. Stop the container(s) using the following command: `docker-compose down`
2. Delete all containers using the following command: `docker rm -f $(docker ps -a -q)`
3. Delete all volumes using the following command: `docker volume rm $(docker volume ls -q)`
4. Restart the containers using the following command: `docker-compose up -d`

+ 4
- 4
apps/teambuddy/src/admin/config/boot_local.php Прегледај датотеку

@@ -4,7 +4,7 @@
********************************************************************************/
// General
Francis_Utils_Config::set( 'url.client', 'http://client.tb.com' );
Francis_Utils_Config::set( 'url.client', '/client' );
// DB settings
Francis_Utils_Config::set( 'db.tbcore.host', 'localhost' );
@@ -18,6 +18,6 @@ Francis_Utils_Config::set( 'db.tbteamdata.user', 'root' );
Francis_Utils_Config::set( 'db.tbteamdata.pass', '' );
// Paths
Francis_Utils_Config::set( 'path.logfile', 'C:/Users/Benny/Desktop/_SYSTEM/log/tbserver-log.txt' );
Francis_Utils_Config::set( 'path.cron_logfile', 'C:/Users/Benny/Desktop/_SYSTEM/log/tbserver-cron-log.txt' );
Francis_Utils_Config::set( 'path.backup_folder', 'C:/Users/Benny/Desktop/_SYSTEM/temp' );
Francis_Utils_Config::set( 'path.logfile', '/var/www/html/logs/tbserver-log.txt' );
Francis_Utils_Config::set( 'path.cron_logfile', '/var/www/html/logs/tbserver-cron-log.txt' );
Francis_Utils_Config::set( 'path.backup_folder', '/var/www/html/temp' );

+ 3
- 2
apps/teambuddy/src/client/config/boot_local.php Прегледај датотеку

@@ -4,8 +4,9 @@
********************************************************************************/
// URLs
Francis_Utils_Config::set( 'url.client', 'http://client.tb.com' );
Francis_Utils_Config::set( 'url.service', 'http://service.tb.com' );
Francis_Utils_Config::set( 'url.client', '/client' );
//Francis_Utils_Config::set( 'url.service', 'http://service.tb.com' );
Francis_Utils_Config::set( 'url.service', '/server' );
Francis_Utils_Config::set( 'braintree.clientToken', 'sandbox_ddbykh5t_mmr6s9yxbhkcf57q' );
//Francis_Utils_Config::set( 'url.client', 'http://192.168.1.102:1338' );
//Francis_Utils_Config::set( 'url.service', 'http://192.168.1.102:1339' );

+ 6
- 6
apps/teambuddy/src/server/config/boot_local.php Прегледај датотеку

@@ -4,23 +4,23 @@
********************************************************************************/
// General
Francis_Utils_Config::set( 'url.client', 'https://client.tb.com' );
Francis_Utils_Config::set( 'url.client', '/server' );
// DB settings
Francis_Utils_Config::set( 'db.tbcore.host', 'localhost' );
Francis_Utils_Config::set( 'db.tbcore.name', 'tb_core' );
Francis_Utils_Config::set( 'db.tbcore.user', 'root' );
Francis_Utils_Config::set( 'db.tbcore.pass', '' );
Francis_Utils_Config::set( 'db.tbcore.pass', 'root' );
Francis_Utils_Config::set( 'db.tbteamdata.host', 'localhost' );
Francis_Utils_Config::set( 'db.tbteamdata.name', 'tb_teamdata' );
Francis_Utils_Config::set( 'db.tbteamdata.user', 'root' );
Francis_Utils_Config::set( 'db.tbteamdata.pass', '' );
Francis_Utils_Config::set( 'db.tbteamdata.pass', 'root' );
// Paths
Francis_Utils_Config::set( 'path.logfile', 'C:/Users/Benny/Desktop/_SYSTEM/log/tbserver-log.txt' );
Francis_Utils_Config::set( 'path.cron_logfile', 'C:/Users/Benny/Desktop/_SYSTEM/log/tbserver-cron-log.txt' );
Francis_Utils_Config::set( 'path.backup_folder', 'C:/Users/Benny/Desktop/_SYSTEM/temp' );
Francis_Utils_Config::set( 'path.logfile', '/var/www/html/logs/tbserver-log.txt' );
Francis_Utils_Config::set( 'path.cron_logfile', '/var/www/html/logs/tbserver-cron-log.txt' );
Francis_Utils_Config::set( 'path.backup_folder', '/temp' );
// PREMIUM: Brainree
Francis_Utils_Config::set( 'braintree.environment', 'sandbox' );


+ 3
- 0
pw_gen.php Прегледај датотеку

@@ -0,0 +1,3 @@
<?php

echo md5( 'test' . 'f353d6af1fae7105bdaee5fa873ec500' );

Loading…
Откажи
Сачувај