Skip to content

Commit 694ff19

Browse files
author
Rafael Grigorian
committed
Updated docker to jetrails/magento-alpine
1 parent a4a90f3 commit 694ff19

File tree

4 files changed

+104
-46
lines changed

4 files changed

+104
-46
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.DS_Store
22
yarn-error.log
3+
/.docker-sync/
34
/node_modules/
4-
/staging/
5+
/public_html/
56
/build/
67
/dist/

docker-compose.yml

Lines changed: 94 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,108 @@
11
version: "2"
22

33
volumes:
4-
persistant:
5-
4+
database:
5+
app-sync:
6+
external: true
7+
networks:
8+
default:
9+
driver: bridge
10+
ipam:
11+
config:
12+
- subnet: "192.168.7.0/28"
613
services:
7-
filesystem:
8-
image: jetrails/magento:1.x-filesystem
14+
php-fpm:
15+
image: jetrails/magento-alpine:php-fpm-5.6
16+
restart: unless-stopped
917
volumes:
10-
- ./staging:/var/www/html
11-
webserver:
12-
image: jetrails/magento:1.x-webserver
13-
hostname: webserver.magento
14-
volumes_from:
15-
- filesystem
16-
ports:
17-
- "80:80"
18-
links:
19-
- database
18+
- app-sync:/var/www/html:rw
19+
networks:
20+
default:
21+
aliases:
22+
- php-fpm.docker.internal
2023
environment:
21-
- VIRTUAL_HOST=magento
22-
- VIRTUAL_PORT=80
23-
- HTTPS_METHOD=noredirect
24-
- ENABLE_SENDMAIL=true
25-
cron:
26-
image: jetrails/magento:1.x-cron
27-
hostname: cron.magento
28-
working_dir: /var/www/html
29-
command: /run-cron.sh
30-
volumes_from:
31-
- filesystem
32-
environment:
33-
- ENABLE_SENDMAIL=true
24+
- VERBOSE=true
25+
expose:
26+
- "9000"
3427
links:
35-
- database
36-
cli:
37-
image: jetrails/magento:1.x-cli
38-
hostname: cli.magento
39-
working_dir: /var/www/html
40-
command: /bin/true
41-
volumes_from:
42-
- filesystem
28+
- mysql
29+
- redis
30+
php-cli:
31+
image: jetrails/magento-alpine:php-cli-5.6
32+
volumes:
33+
- app-sync:/var/www/html:rw
34+
networks:
35+
default:
36+
aliases:
37+
- php-cli.docker.internal
4338
links:
44-
- database
39+
- mysql
40+
- redis
41+
php-cron:
42+
image: jetrails/magento-alpine:php-cron-5.6
43+
restart: unless-stopped
44+
volumes:
45+
- app-sync:/var/www/html:rw
46+
networks:
47+
default:
48+
aliases:
49+
- php-cron.docker.internal
4550
environment:
46-
- MAGEREPO_EDITION=enterprise
47-
- MAGEREPO_RELEASE=1.14.3.7
48-
database:
49-
image: jetrails/magento:1.x-database
51+
- VERBOSE=false
52+
links:
53+
- mysql
54+
- redis
55+
nginx:
56+
image: jetrails/magento-alpine:nginx
57+
restart: unless-stopped
5058
volumes:
51-
- persistant:/var/lib/mysql
59+
- app-sync:/var/www/html:rw
60+
networks:
61+
default:
62+
aliases:
63+
- nginx.docker.internal
64+
environment:
65+
- VERBOSE=true
66+
- MAGENTO_VERSION=1
67+
links:
68+
- php-fpm
5269
ports:
53-
- 3306
70+
- "443:443"
71+
mysql:
72+
image: jetrails/magento-alpine:mysql
73+
restart: unless-stopped
74+
volumes:
75+
- database:/var/lib/mysql
76+
networks:
77+
default:
78+
aliases:
79+
- localhost
80+
- mysql.docker.internal
5481
environment:
82+
- VERBOSE=false
5583
- MYSQL_ROOT_PASSWORD=magento
56-
- MYSQL_USER=magento
57-
- MYSQL_PASSWORD=magento
84+
- MYSQL_USER_NAME=magento
85+
- MYSQL_USER_PASSWORD=magento
5886
- MYSQL_DATABASE=magento
87+
varnish:
88+
image: jetrails/magento-alpine:varnish
89+
restart: unless-stopped
90+
environment:
91+
- VERBOSE=false
92+
networks:
93+
default:
94+
aliases:
95+
- varnish.docker.internal
96+
links:
97+
- nginx
98+
ports:
99+
- "80:80"
100+
redis:
101+
image: jetrails/magento-alpine:redis
102+
restart: unless-stopped
103+
networks:
104+
default:
105+
aliases:
106+
- redis.docker.internal
107+
environment:
108+
- VERBOSE=false

docker-sync.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: "2"
2+
3+
syncs:
4+
app-sync:
5+
src: "./public_html"
6+
sync_userid: 1000
7+
sync_groupid: 1000

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const EXTENSION_VERSION = config.version
2121
const MODULE_SHORT_NAME = config.name.replace ( /^.*-/, "" )
2222
const SOURCE_DIR = "src"
2323
const BUILD_DIR = "build"
24-
const STAGING_DIR = "staging"
24+
const STAGING_DIR = "public_html"
2525
const SOURCE_PATH = path.join ( __dirname, SOURCE_DIR )
2626
const BUILD_PATH = path.join ( __dirname, BUILD_DIR )
2727
const STAGING_PATH = path.join ( __dirname, STAGING_DIR )

0 commit comments

Comments
 (0)