From 82059bbfb0cf7dca802d3bee9e6a5cf1b427b3b5 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Tue, 26 Jun 2018 19:05:08 -0700 Subject: [PATCH] remove nginx Dockerfile because it's not actually necessary --- .travis.yml | 50 +++---- .../Dockerrun.aws.json => Dockerrun.aws.json | 24 +++- docker-compose.yml | 14 +- nginx/Dockerfile | 3 - nginx/nginx-aws.conf | 122 ------------------ nginx/nginx.conf | 122 ------------------ 6 files changed, 59 insertions(+), 276 deletions(-) rename server/Dockerrun.aws.json => Dockerrun.aws.json (72%) delete mode 100644 nginx/Dockerfile delete mode 100644 nginx/nginx-aws.conf delete mode 100644 nginx/nginx.conf diff --git a/.travis.yml b/.travis.yml index 721092f3..1a6f47f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,33 +22,39 @@ script: after_success: # only run this if on the master branch eventually, not while testing tho -- sudo apt-get install -y python3.4 -- sudo apt-get install --upgrade -y python-pip -- sudo apt-get install jq -- sudo pip install --user virtualenv -# Create a virtual environment for AWS CLI -- virtualenv my_py3 --python=/usr/bin/python3.4 -- source my_py3/bin/activate -- pip install --upgrade awscli -- pip install --upgrade awsebcli -# Set AWS information -- aws configure set aws_access_key_id $AWS_ACCESS_KEY -- aws configure set aws_secret_access_key $AWS_SECRET_KEY -- aws configure set default.region $AWS_REGION -- aws configure set metadata_service_timeout 1200 -- aws configure set metadata_service_num_attempts 3 -- aws configure list +# - sudo apt-get install -y python3.4 +# - sudo apt-get install --upgrade -y python-pip +# - sudo apt-get install jq +# - sudo pip install --user virtualenv +# # Create a virtual environment for AWS CLI +# - virtualenv my_py3 --python=/usr/bin/python3.4 +# - source my_py3/bin/activate +# - pip install --upgrade awscli +# - pip install --upgrade awsebcli +# # Set AWS information +# - aws configure set aws_access_key_id $AWS_ACCESS_KEY +# - aws configure set aws_secret_access_key $AWS_SECRET_KEY +# - aws configure set default.region $AWS_REGION +# - aws configure set metadata_service_timeout 1200 +# - aws configure set metadata_service_num_attempts 3 +# - aws configure list # build images - docker-compose stop - docker-compose build --no-cache - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -- docker image ls -- docker tag $APP_IMAGE_NAME $DOCKER_USERNAME/$DOCKER_REPOSITORY:app_$TRAVIS_BUILD_ID -- docker tag $NGINX_IMAGE_NAME $DOCKER_USERNAME/$DOCKER_REPOSITORY:nginx_$TRAVIS_BUILD_ID -- docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:app_$TRAVIS_BUILD_ID -- docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:nginx_$TRAVIS_BUILD_ID +- docker tag $APP_IMAGE_NAME $DOCKER_USERNAME/$DOCKER_REPOSITORY:$TRAVIS_BUILD_ID +- docker push $DOCKER_USERNAME/$DOCKER_REPOSITORY:$TRAVIS_BUILD_ID env: global: - APP_IMAGE_NAME=p5jswebeditor_app - - NGINX_IMAGE_NAME=p5jswebeditor_nginx \ No newline at end of file + +deploy: + provider: elasticbeanstalk + access_key_id: $AWS_ACCESS_KEY + secret_access_key: + secure: $AWS_SECRET_KEY + region: $AWS_REGION + app: $AWS_EBS_APP + env: $AWS_EBS_ENV + bucket_name: "the-target-S3-bucket" \ No newline at end of file diff --git a/server/Dockerrun.aws.json b/Dockerrun.aws.json similarity index 72% rename from server/Dockerrun.aws.json rename to Dockerrun.aws.json index 261d66c5..ba49309a 100644 --- a/server/Dockerrun.aws.json +++ b/Dockerrun.aws.json @@ -33,7 +33,7 @@ "mountPoints": [ { "sourceVolume": "storage", - "containerPath": "/var/lib/mysql" + "containerPath": "/var/opt/mongo" } ], "environment": [ @@ -64,10 +64,30 @@ "mountPoints": [ { "sourceVolume": "app", - "containerPath": "/var/www/html", + "containerPath": "/var/opt/app", "readOnly": true } ] + }, + { + "name": "nginx", + "essential": true, + "memory": 128, + "portMappings": [ + { + "hostPort": 80, + "containerPort": 8000 + } + ], + "links": [ + "app" + ], + "mountPoints": [ + { + "sourceVolume": "awseb-logs-nginx-proxy", + "containerPath": "/var/log/nginx" + } + ] } ] } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8db3575b..1533a45a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,19 +10,23 @@ services: ports: - '27017:27017' # restart: always - # env_file: - # - .env + env_file: + - .env nginx: - build: ./nginx + image: nginx:1.13 + volumes: + - "$PWD/nginx/alpha.editor.p5js.org.conf:/etc/nginx/conf.d/default.conf" ports: - '80:80' + depends_on: + - app app: build: context: . dockerfile: Dockerfile target: production - # env_file: - # - .env + env_file: + - .env environment: - MONGO_URL=mongodb://mongo:27017/p5js-web-editor - MONGO_HOSTNAME=mongo diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index cbe1e0b1..00000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:1.13.12 - -COPY alpha.editor.p5js.org.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/nginx/nginx-aws.conf b/nginx/nginx-aws.conf deleted file mode 100644 index b0ab9feb..00000000 --- a/nginx/nginx-aws.conf +++ /dev/null @@ -1,122 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /var/log/nginx/error.log; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; - - include /etc/nginx/sites-enabled/*.conf; - - index index.html index.htm; - - server { - listen 80 default_server; - listen [::]:80 default_server; - server_name localhost; - root /usr/share/nginx/html; - - # Load configuration files for the default server block. - include /etc/nginx/default.d/*.conf; - - location / { - } - - # redirect server error pages to the static page /40x.html - # - error_page 404 /404.html; - location = /40x.html { - } - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} - } - - -# Settings for a TLS enabled server. -# -# server { -# listen 443 ssl; -# listen [::]:443 ssl; -# server_name localhost; -# root /usr/share/nginx/html; -# -# ssl_certificate "/etc/pki/nginx/server.crt"; -# ssl_certificate_key "/etc/pki/nginx/private/server.key"; -# # It is *strongly* recommended to generate unique DH parameters -# # Generate them with: openssl dhparam -out /etc/pki/nginx/dhparams.pem 2048 -# #ssl_dhparam "/etc/pki/nginx/dhparams.pem"; -# ssl_session_cache shared:SSL:1m; -# ssl_session_timeout 10m; -# ssl_protocols TLSv1 TLSv1.1 TLSv1.2; -# ssl_ciphers HIGH:SEED:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!RSAPSK:!aDH:!aECDH:!EDH-DSS-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:!SRP; -# ssl_prefer_server_ciphers on; -# -# # Load configuration files for the default server block. -# include /etc/nginx/default.d/*.conf; -# -# location / { -# } -# -# error_page 404 /404.html; -# location = /40x.html { -# } -# -# error_page 500 502 503 504 /50x.html; -# location = /50x.html { -# } -# } - -} \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf deleted file mode 100644 index 7d128192..00000000 --- a/nginx/nginx.conf +++ /dev/null @@ -1,122 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /var/log/nginx/error.log; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - # include /etc/nginx/conf.d/*.conf; - - include /etc/nginx/sites-enabled/*.conf; - - # index index.html index.htm; - - # server { - # listen 80 default_server; - # listen [::]:80 default_server; - # server_name localhost; - # root /usr/share/nginx/html; - - # # Load configuration files for the default server block. - # include /etc/nginx/default.d/*.conf; - - # location / { - # } - - # # redirect server error pages to the static page /40x.html - # # - # error_page 404 /404.html; - # location = /40x.html { - # } - - # # redirect server error pages to the static page /50x.html - # # - # error_page 500 502 503 504 /50x.html; - # location = /50x.html { - # } - - # # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # # - # #location ~ \.php$ { - # # proxy_pass http://127.0.0.1; - # #} - - # # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # # - # #location ~ \.php$ { - # # root html; - # # fastcgi_pass 127.0.0.1:9000; - # # fastcgi_index index.php; - # # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # # include fastcgi_params; - # #} - - # # deny access to .htaccess files, if Apache's document root - # # concurs with nginx's one - # # - # #location ~ /\.ht { - # # deny all; - # #} - # } - - -# Settings for a TLS enabled server. -# -# server { -# listen 443 ssl; -# listen [::]:443 ssl; -# server_name localhost; -# root /usr/share/nginx/html; -# -# ssl_certificate "/etc/pki/nginx/server.crt"; -# ssl_certificate_key "/etc/pki/nginx/private/server.key"; -# # It is *strongly* recommended to generate unique DH parameters -# # Generate them with: openssl dhparam -out /etc/pki/nginx/dhparams.pem 2048 -# #ssl_dhparam "/etc/pki/nginx/dhparams.pem"; -# ssl_session_cache shared:SSL:1m; -# ssl_session_timeout 10m; -# ssl_protocols TLSv1 TLSv1.1 TLSv1.2; -# ssl_ciphers HIGH:SEED:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!RSAPSK:!aDH:!aECDH:!EDH-DSS-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:!SRP; -# ssl_prefer_server_ciphers on; -# -# # Load configuration files for the default server block. -# include /etc/nginx/default.d/*.conf; -# -# location / { -# } -# -# error_page 404 /404.html; -# location = /40x.html { -# } -# -# error_page 500 502 503 504 /50x.html; -# location = /50x.html { -# } -# } - -} \ No newline at end of file