Skip to content

Commit

Permalink
Small changes to REMP docker installation
Browse files Browse the repository at this point in the history
- Fixed permissions issues after installation via `remp.sh`.
  (`.env` files, Laravel's storage folder, Nette's temp).
- MySQL version changed to 5.7 (tested & used by us; we need to fix
  issue with new authentication plugin in MySQL 8.0.4).

remp/remp#187
  • Loading branch information
markoph committed Mar 1, 2018
1 parent 9005c52 commit 07533fa
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
10 changes: 5 additions & 5 deletions Beam/go/cmd/segments/.env.example
@@ -1,13 +1,13 @@
SEGMENTS_ADDR=:8082
SEGMENTS_DEBUG=true

SEGMENTS_INFLUX_ADDR=http://influxdb:8086
SEGMENTS_INFLUX_DBNAME=beam
SEGMENTS_INFLUX_USER=root
SEGMENTS_INFLUX_PASSWD=secret

SEGMENTS_MYSQL_NET=tcp
SEGMENTS_MYSQL_ADDR=mysql:3306
SEGMENTS_MYSQL_DBNAME=beam
SEGMENTS_MYSQL_USER=root
SEGMENTS_MYSQL_PASSWD=secret

SEGMENTS_INFLUX_ADDR=http://influxdb:8086
SEGMENTS_INFLUX_DBNAME=beam
SEGMENTS_INFLUX_USER=root
SEGMENTS_INFLUX_PASSWD=secret
12 changes: 6 additions & 6 deletions Beam/go/cmd/segments/README.md
Expand Up @@ -44,12 +44,12 @@ variable|example value
--- | ---
SEGMENTS_ADDR|`:8082`
SEGMENTS_DEBUG|`true`
SEGMENTS_INFLUX_ADDR|`http://influxdb:8086`
SEGMENTS_INFLUX_DBNAME|`beam`
SEGMENTS_INFLUX_USERNAME|`root`
SEGMENTS_INFLUX_PASSWORD|`secret`
SEGMENTS_MYSQL_NET|`tcp`
SEGMENTS_MYSQL_ADDR|`beam_mysql:3306`
SEGMENTS_MYSQL_DBNAME|`remp_beam`
SEGMENTS_MYSQL_ADDR|`mysql:3306`
SEGMENTS_MYSQL_DBNAME|`beam`
SEGMENTS_MYSQL_USER|`root`
SEGMENTS_MYSQL_PASSWD|`secret`
SEGMENTS_INFLUX_ADDR|`http://influxdb:8086`
SEGMENTS_INFLUX_DBNAME|`beam`
SEGMENTS_INFLUX_USER|`root`
SEGMENTS_INFLUX_PASS|`secret`
4 changes: 2 additions & 2 deletions Beam/go/cmd/tracker/README.md
Expand Up @@ -42,8 +42,8 @@ TRACKER_ADDR|`:8081`
TRACKER_BROKER_ADDR|`kafka:9092`
TRACKER_DEBUG|`true`
TRACKER_MYSQL_NET|`tcp`
TRACKER_MYSQL_ADDR|`beam_mysql:3306`
TRACKER_MYSQL_DBNAME|`remp_beam`
TRACKER_MYSQL_ADDR|`mysql:3306`
TRACKER_MYSQL_DBNAME|`beam`
TRACKER_MYSQL_USER|`root`
TRACKER_MYSQL_PASSWD|`secret`
TRACKER_INFLUX_ADDR|`http://influxdb:8086`
Expand Down
9 changes: 8 additions & 1 deletion Docker/php/remp.sh
Expand Up @@ -4,7 +4,8 @@ cd ${APP_NAME}

if [ ! -f ".env" ]
then
cp .env.example .env
# create .env with default values, preserve user permissions
cp -p .env.example .env

composer install

Expand Down Expand Up @@ -32,12 +33,18 @@ then
if [ $? -eq "0" ]; then
php artisan jwt:secret
fi

# Update permissions for Laravel storage (cache) folder
chmod -R 777 storage
elif [ -f "bin/command.php" ]
then
cp app/config/config.local.neon.example app/config/config.local.neon
php bin/command.php migrate:migrate
php bin/command.php db:seed
php bin/command.php demo:seed

# Update permissions for Nette temp (cache) & log folder
chmod -R 777 temp log
fi
fi
php-fpm
Expand Down
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -84,7 +84,7 @@ Note: If you use Docker Toolbox, the IP won't be `127.0.0.1`. Use `docker-machin

Docker will install all the dependencies, prepares the DB structure and also inserts demo data.

The appliance was tested with Docker CE 2017.06.
The appliance was tested with Docker CE 17.12.0 and Docker Compose 1.16.1.

## Manual installation

Expand All @@ -104,6 +104,7 @@ Couple of neat commands:
* `docker-compose ps` to list all services with their status
* `docker-compose logs` to read services logs
* `docker-compose build` to force rebuild of images
* `docker-compose exec campaign /bin/bash` to connect to `campaign` container
* `docker images` to list all available docker images

## PHP Debugging
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Expand Up @@ -24,7 +24,7 @@ services:
- "mailhog.remp.press"

mysql:
image: "mysql:8.0"
image: "mysql:5.7"
volumes:
- "mysql-data:/var/lib/mysql"
- "./Docker/mysql/init.sql:/docker-entrypoint-initdb.d/init.sql"
Expand Down

0 comments on commit 07533fa

Please sign in to comment.