Skip to content
This repository has been archived by the owner on Jul 25, 2023. It is now read-only.

Commit

Permalink
Merge pull request #2 from meanbee/1-m2.2-upgrade
Browse files Browse the repository at this point in the history
1 m2.2 upgrade
  • Loading branch information
tgerulaitis authored Nov 17, 2017
2 parents 86729f9 + eac8330 commit 4d01e32
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 94 deletions.
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
COMPOSE_PROJECT_NAME=m2_meanbee_svghelper
COMPOSE_PROJECT_NAME=m2_meanbee_svghelper

PROJECT_HOSTNAME=m2-meanbee-svghelper.dev.docker
PROJECT_CERT=dev.docker
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ composer require meanbee/magento2-svghelper
A Docker development environment is included with the project:

```
mkdir magento
docker-compose up -d db # Allow a few seconds for the db to initalise
docker-compose run --rm cli bash /src/setup.sh
docker-compose up -d
docker-compose run --rm cli magento-extension-installer Meanbee_SVGHelper \
&& docker-compose up -d
```

## Usage
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "meanbee/magento2-svghelper",
"description": "Magento 2 module that provides a block level helper for reading in an SVG files source from a theme",
"type": "magento2-module",
"version": "1.0.0",
"version": "1.1.0",
"license": [
"Commercial"
],
Expand All @@ -13,7 +13,7 @@
}
},
"require": {
"magento/framework": "100.1.*",
"magento/framework": "^101.0.0",
"psr/log": "~1.0"
},
"authors": [
Expand All @@ -30,4 +30,4 @@
"Meanbee\\SVGHelper\\": "/src"
}
}
}
}
107 changes: 45 additions & 62 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,114 +2,97 @@ version: "2"
services:
varnish:
image: meanbee/magento2-varnish:latest
hostname: m2-meanbee-svghelper.docker
hostname: ${PROJECT_HOSTNAME}
ports:
- 80
environment:
- VIRTUAL_HOST=m2-meanbee-svghelper.docker
- VIRTUAL_PORT=80
- HTTPS_METHOD=noredirect
- CERT_NAME=default
VIRTUAL_HOST: ${PROJECT_HOSTNAME}
VIRTUAL_PORT: 80
HTTPS_METHOD: noredirect
CERT_NAME: ${PROJECT_CERT}
links:
- web

web:
image: meanbee/magento2-nginx:1.9
hostname: web.m2-meanbee-svghelper.docker
hostname: web.${PROJECT_HOSTNAME}
ports:
- 80
volumes_from:
- appdata
env_file:
- ./magento.env
- magento
links:
- fpm

fpm:
image: meanbee/magento2-php:7.0-fpm
hostname: fpm.m2-meanbee-svghelper.docker
hostname: fpm.${PROJECT_HOSTNAME}
ports:
- 9000
volumes_from:
- appdata
env_file:
- ./magento.env
- magento
environment:
- ENABLE_SENDMAIL=true
- PHP_ENABLE_XDEBUG
ENABLE_SENDMAIL: "true"
PHP_ENABLE_XDEBUG:
links:
- db

cron:
image: meanbee/magento2-php:7.0-cli
hostname: cron.m2-meanbee-svghelper.docker
hostname: cron.${PROJECT_HOSTNAME}
command: run-cron
volumes_from:
- appdata
env_file:
- ./magento.env
- magento
environment:
- ENABLE_SENDMAIL=true
ENABLE_SENDMAIL: "true"
links:
- db

cli:
image: meanbee/magento2-php:7.0-cli
volumes_from:
- appdata
volumes:
- ~/.composer:/root/.composer
env_file:
- ./magento.env
- magento
environment:
- COMPOSER_HOME=/root/.composer
- COMPOSER_ALLOW_SUPERUSER=1
- M2SETUP_INSTALL_DB=true
- M2SETUP_VERSION=2.1.*
- M2SETUP_USE_SAMPLE_DATA=true
- M2SETUP_DB_HOST=db
- M2SETUP_DB_NAME=magento2
- M2SETUP_DB_USER=magento2
- M2SETUP_DB_PASSWORD=magento2
- M2SETUP_BASE_URL=https://m2-meanbee-svghelper.docker/
- M2SETUP_BACKEND_FRONTNAME=admin
- M2SETUP_ADMIN_FIRSTNAME=Admin
- M2SETUP_ADMIN_LASTNAME=User
- M2SETUP_ADMIN_EMAIL=[email protected]
- M2SETUP_ADMIN_USER=admin
- M2SETUP_ADMIN_PASSWORD=password123
COMPOSER_HOME: /root/.composer
COMPOSER_ALLOW_SUPERUSER: 1
M2SETUP_INSTALL_DB: "true"
M2SETUP_VERSION: 2.2.*
M2SETUP_USE_SAMPLE_DATA: "true"
M2SETUP_DB_HOST: db
M2SETUP_DB_NAME: magento2
M2SETUP_DB_USER: magento2
M2SETUP_DB_PASSWORD: magento2
M2SETUP_BASE_URL: https://${PROJECT_HOSTNAME}/
M2SETUP_BACKEND_FRONTNAME: admin
M2SETUP_ADMIN_FIRSTNAME: Admin
M2SETUP_ADMIN_LASTNAME: User
M2SETUP_ADMIN_EMAIL: [email protected]
M2SETUP_ADMIN_USER: admin
M2SETUP_ADMIN_PASSWORD: password123
links:
- db

db:
image: mariadb:10
ports:
- 3306
volumes_from:
- dbdata
env_file:
- ./magento.env
volumes:
- dbdata:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=magento2
- MYSQL_USER=magento2
- MYSQL_PASSWORD=magento2
- MYSQL_DATABASE=magento2
- TERM=dumb
MYSQL_ROOT_PASSWORD: magento2
MYSQL_USER: magento2
MYSQL_PASSWORD: magento2
MYSQL_DATABASE: magento2
TERM: dumb

appdata:
image: cweagans/bg-sync
magento:
image: meanbee/magento2-data:2.2-sample
volumes:
- /var/www/magento
- .:/src
- .:/extensions/Meanbee_SVGHelper
environment:
- SYNC_SOURCE=/var/www/magento
- SYNC_DESTINATION=/src/magento
- SYNC_VERBOSE=1
- SYNC_MAX_INOTIFY_WATCHES=64000
SYNC_DESTINATION: /extensions/Meanbee_SVGHelper/magento
privileged: true
restart: always

volumes:
dbdata:
image: tianon/true
volumes:
- /var/lib/mysql
# Database tables

2 changes: 0 additions & 2 deletions magento.env

This file was deleted.

22 changes: 0 additions & 22 deletions setup.sh

This file was deleted.

0 comments on commit 4d01e32

Please sign in to comment.