Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/javascript/controllers/cards/list_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class MapController extends ListController {
return
}

mapboxgl.accessToken = 'pk.eyJ1IjoibmtjciIsImEiOiI4UnhLZEx3In0.bakfmpx2lREiNbHn0lWq9Q';
mapboxgl.accessToken = 'pk.eyJ1IjoibmtjciIsImEiOiJjbW96NmIxMXAwazZuMnJzODcxOTgwMjJvIn0.dnUk5wEh7m2sWkDgBPSygg';
var zoom = 0;
if (window.innerWidth < 626) {
zoom = 9;
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/controllers/cards/location_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default class LocationController extends Controller {
return
}

mapboxgl.accessToken = 'pk.eyJ1IjoibmtjciIsImEiOiI4UnhLZEx3In0.bakfmpx2lREiNbHn0lWq9Q';
mapboxgl.accessToken = 'pk.eyJ1IjoibmtjciIsImEiOiJjbW96NmIxMXAwazZuMnJzODcxOTgwMjJvIn0.dnUk5wEh7m2sWkDgBPSygg';
var zoom = 0;
if (window.innerWidth < 626) {
zoom = 7;
Expand All @@ -22,7 +22,7 @@ export default class LocationController extends Controller {

const map = new mapboxgl.Map({
container: 'mapbox',
style: 'mapbox://styles/nkcr/ck4vla6vz2ir81cnya5cl6uog',
style: 'mapbox://styles/nkcr/ckoxc46cg1eqy17pfcfzq79gx',
minZoom: 6,
center: [6.637289636687626, 46.60327680658895],
zoom: zoom,
Expand Down
113 changes: 55 additions & 58 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# docker-compose build app
# docker-compose up
# docker-compose run --rm app bundle # Gemfile change
Expand All @@ -9,28 +8,27 @@
version: '3.7'

services:
app:
image: nkcr/resj:v1
build:
context: .
command: ["spring", "server"]
environment:
- POSTGRES_HOST=pg
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=secret
- RAILS_ENV=development
volumes:
- ./:/usr/src/app
- gems:/usr/local/bundle
- node-modules:/usr/src/app/node_modules
- ${HOME}/.irbrc:/root/.irbrc
- ${HOME}/.irb-history:/root/.irb-history
# app:
# image: nkcr/resj:v1
# build:
# context: .
# command: [ "spring", "server" ]
# environment:
# - POSTGRES_HOST=pg
# - POSTGRES_USER=postgres
# - POSTGRES_PASSWORD=secret
# - RAILS_ENV=development
# volumes:
# - ./:/usr/src/app
# - gems:/usr/local/bundle
# - node-modules:/usr/src/app/node_modules
# - ${HOME}/.irbrc:/root/.irbrc
# - ${HOME}/.irb-history:/root/.irb-history

web:
image: nkcr/resj:v1
command: >
bash -c "while !</dev/tcp/pg/5432; do sleep 1; done;
bundle exec rails s -b 0.0.0.0"
bash -c "while !</dev/tcp/pg/5432; do sleep 1; done; bundle exec rails s -b 0.0.0.0"
environment:
- POSTGRES_HOST=pg
- POSTGRES_USER=postgres
Expand All @@ -50,50 +48,49 @@ services:
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=secret

webpacker:
image: nkcr/resj:v1
command: ./bin/webpack-dev-server --color
volumes:
- ./:/usr/src/app
- gems:/usr/local/bundle
- node-modules:/usr/src/app/node_modules
ports:
- 3035:3035
# webpacker:
# image: nkcr/resj:v1
# command: ./bin/webpack-dev-server --color
# volumes:
# - ./:/usr/src/app
# - gems:/usr/local/bundle
# - node-modules:/usr/src/app/node_modules
# ports:
# - 3035:3035


volumes:
gems:
node-modules:

# version: '3.0'
# services:
# db:
# image: postgres:10
# ports:
# - 5432:5432
# environment:
# POSTGRES_PASSWORD: ${DB_USER_PASSWORD}
# version: '3.0'
# services:
# db:
# image: postgres:10
# ports:
# - 5432:5432
# environment:
# POSTGRES_PASSWORD: ${DB_USER_PASSWORD}

# webpacker:
# image: nkcr/resj:v1
# command: ["./scripts/start_webpack_dev.sh"]
# volumes:
# - .:/opt/dockerrailsdemo:cached
# ports:
# - 3035:3035
# webpacker:
# image: nkcr/resj:v1
# command: ["./scripts/start_webpack_dev.sh"]
# volumes:
# - .:/opt/dockerrailsdemo:cached
# ports:
# - 3035:3035

# web:
# image: nkcr/resj:v1
# build:
# context: .
# args:
# precompileassets: 'not'
# links:
# - db
# - webpacker
# ports:
# - 3000:3000
# command: ["./scripts/wait-for-it.sh", "db:5432", "--", "./scripts/start_rails.sh"]
# volumes:
# - .:/opt/dockerrailsdemo:cached
# web:
# image: nkcr/resj:v1
# build:
# context: .
# args:
# precompileassets: 'not'
# links:
# - db
# - webpacker
# ports:
# - 3000:3000
# command: ["./scripts/wait-for-it.sh", "db:5432", "--", "./scripts/start_rails.sh"]
# volumes:
# - .:/opt/dockerrailsdemo:cached