Remove unwanted container_name to fix staging (#983)

* Remove unwanted container_name

* Reference web container for current compose project

* Change docker for docker-compose reference

* Change initializer to factory syntax (#944)

* change to factory syntax

* fix typo

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Sasha Boginsky <41092741+sashadev-sky@users.noreply.github.com>

* Update app/assets/javascripts/mapknitter/Annotations.js

Co-Authored-By: Gaurav Sachdeva <sachdeva.gaurav1997@gmail.com>

* try different syntax

* Put env var in right place

* Run instead of exec to be able to pass env vars.

* Pointer fix for Image options (#935)

* Latest pull from upstream

* Pointer changes

* Deeleted extra files

* Delete passenger.3000.pid.lock

Deleted file

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Last update to app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update _index.html.erb

* Update _index.html.erb

* Update CODE_OF_CONDUCT.md (#992)

Update code of conduct to reflect changes on https://publiclab.org/conduct Aug 28th, 2019

* Removed the dotted line from OAuth button options (#981)

* Grid-view-follow-up (#964)

* Bump bootsnap from 1.4.4 to 1.4.5 (#977)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](Shopify/bootsnap@v1.4.4...v1.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Setting ForeGO instead of Foreman (#995)

* Setting up ForeGO in favor of Foreman(deprecated)

* Bundle updating gems

* Bump faker from 2.1.2 to 2.2.1 (#984)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](faker-ruby/faker@v2.1.2...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* change run to exec

* run instead of exec

Author: icarito

Makefile

@@ -1,7 +1,7 @@
 export COMPOSE_HTTP_TIMEOUT=360
 
 define wait_for_container
-	@while ! docker logs mapknitter | grep "web server started"; do\
+	@while ! docker-compose logs web | grep "web server started"; do\
 		echo "Serving Mapknitter";\
 		sleep 10;\
 	done;
@@ -22,8 +22,8 @@ redeploy-container:
 	docker-compose down --remove-orphans
 	docker-compose up --force-recreate -d
 	$(call wait_for_container)
-	docker exec -e DISABLE_DATABASE_ENVIRONMENT_CHECK=1 mapknitter bash -lc \
-												"bundle exec rails db:drop && \
-												 bundle exec rails db:create && \
-												 bundle exec rails db:schema:load && \
-												 bundle exec rails db:migrate"
+	docker-compose run -e "DISABLE_DATABASE_ENVIRONMENT_CHECK=1" --rm web bash -lc \
+				"bundle exec rails db:drop && \
+				 bundle exec rails db:create && \
+				 bundle exec rails db:schema:load && \
+				 bundle exec rails db:migrate"

docker-compose.yml

@@ -1,15 +1,13 @@
 version: '3.3'
 services:
   db:
-    container_name: database
     image: mysql:5.7
     env_file:
       - mapknitter.env
     volumes:
       - ../mysql:/var/lib/mysql
       - ../dump:/docker-entrypoint-initdb.d
   web:
-    container_name: mapknitter
     build: .
     env_file:
       - mapknitter.env