Skip to content

Commit

Permalink
Change directory structure to match docker environment
Browse files Browse the repository at this point in the history
  • Loading branch information
portchris committed Nov 26, 2018
1 parent 943a43a commit 3337cbb
Show file tree
Hide file tree
Showing 2,000 changed files with 153 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.git
.gitignore
docs/*
env/local/*
src/app/etc/local.xml
src/var
src/media
27 changes: 27 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM convertdigital/base-magento1:1.9

# Uncomment where required

# Add cron jobs
# ADD ./env/common/config/cron /etc/cron.d

# Add common configuration
# ADD ./env/common/config/php-fpm /etc/php/5.6/fpm
# ADD ./env/common/config/nginx /etc/nginx

# Add production configuration
# ADD ./env/production/config/php-fpm /etc/php/5.6/fpm
# ADD ./env/production/config/nginx /etc/nginx

# Add scripts
# ADD ./env/production/scripts /scripts

# Add ioncube
# ADD ./env/common/binaries/ioncube_loader_lin_5.6.so /usr/lib/php/20131226/
# ADD ./env/common/config/php-fpm/mods-available /etc/php/5.6/mods-available
# RUN ln -s /etc/php/5.6/mods-available/ioncube.ini /etc/php/5.6/fpm/conf.d/0-ioncube.ini && \
# ln -s /etc/php/5.6/mods-available/ioncube.ini /etc/php/5.6/cli/conf.d/0-ioncube.ini

# Add source
ADD ./src /var/www/src

52 changes: 52 additions & 0 deletions env/local/config/nginx/conf.d/default.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
server {
listen 80;
server_name naturalremedy.portchris;
set $domain $host;

# Set Magento 1 variables
set $MAGE_ROOT /var/www/src;

# Custom configuration
include /etc/nginx/client/conf-start.conf;

# Set the store code for the server block
# See client/locations.conf for subfolder multisite setup
set $code default;

root $MAGE_ROOT;
error_log /var/log/errors.log;
access_log /var/log/access.log;

# Blocked locations
include /etc/nginx/client/blocked-locations.conf;
include /etc/nginx/global/blocked-locations.conf;

# Block spam referrers in map
# if ($bad_referer) { return 444; }

# 301 redirects
include /etc/nginx/client/301-redirects.conf;

# Allowed locations
include /etc/nginx/global/locations.conf;
include /etc/nginx/client/locations.conf;

# Static files
include /etc/nginx/global/static.conf;

# Rewrites for Magento API
include /etc/nginx/global/api.conf;

# Blocked locations
include /etc/nginx/client/blocked-locations.conf;
include /etc/nginx/global/blocked-locations.conf;

# php execution
include /etc/nginx/global/php.conf;

# Error pages
include /etc/nginx/global/error-pages.conf;

# Custom configuration
include /etc/nginx/client/conf-end.conf;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 3337cbb

Please sign in to comment.