Skip to content
This repository has been archived by the owner on Jan 15, 2025. It is now read-only.

[fix] Misc. roadblocks of a first-time user #14

Open
wants to merge 5 commits into
base: feature/socialView
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .dockerignore
domq marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
/app/assets/builds/*
!/app/assets/builds/.keep
/public/assets
/vendor/

Dockerfile
db/*.sqlite3
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ patch:


.git/hooks/pre-commit:
if [ ! -l .git/hooks ] ; then mv .git/hooks .git/hooks.trashme && ln -s ../.git_hooks .git/hooks ; fi
if [ ! -L .git/hooks ] ; then mv .git/hooks .git/hooks.trashme && ln -s ../.git_hooks .git/hooks ; fi

.env:
@echo ".env file not present. Please copy .env.sample and edit to fit your setup"
Expand Down
2 changes: 1 addition & 1 deletion bin/restoredb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e
# set -x
. .env
COMPOSE="${COMPOSE:-docker-compose.yml}"
DATASRC="${DATASRC:-peo11}"
DATASRC="${DATASRC:-dinfo@dinfo11}"

DUMPDIR="${DUMPDIR:-tmp/dbdumps}"

Expand Down
4 changes: 2 additions & 2 deletions config/importmap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
pin "@hotwired/stimulus", to: "stimulus.min.js"
pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
pin_all_from "app/javascript/controllers", under: "controllers"
pin "@rails/request.js", to: "@rails--request.js.js" # @0.0.9
pin "sortablejs" # @1.15.2
pin "@rails/request.js", to: "https://ga.jspm.io/npm:@rails/[email protected]/src/index.js"
pin "sortablejs", to: "https://ga.jspm.io/npm:sortablejs@1.15.2/modular/sortable.esm.js"
pin "trix"
pin "@rails/actiontext", to: "actiontext.esm.js"
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# is *not* meant for production.
# https://www.keycloak.org/server/reverseproxy

version: "3.9"
name: people2023

services:
Expand Down