Skip to content

Commit 68b1c6c

Browse files
committed
Fix config files
1 parent c128580 commit 68b1c6c

13 files changed

+59
-21
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ RUN apt-get update && \
2121

2222
RUN gem install htmlbeautifier
2323

24-
COPY setup.sh .
25-
RUN bash ./setup.sh
24+
COPY setup-container.sh .
25+
RUN bash ./setup-container.sh
2626

2727
ENV MIX_HOME=/root/.mix
2828
ENV HEX_HOME=/root/.hex

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
"stylelint.vscode-stylelint",
1313
"ms-azuretools.vscode-docker",
1414
"pantajoe.vscode-elixir-credo",
15+
"stkb.rewrap",
1516
"samuel-pordeus.elixir-test"
1617
],
1718
"settings": {
1819
"terminal.integrated.shell.linux": "/usr/bin/zsh"
1920
},
2021
"forwardPorts": [4000],
21-
"postCreateCommand": "cp config/dev.exs.example config/dev.exs && cp config/test.exs.example config/test.exs"
22+
"postCreateCommand": "cp config/dev.local.exs.example config/dev.local.exs && cp config/test.local.exs.example config/test.local.exs"
2223
}

.devcontainer/docker-compose.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@ services:
2020
- db:/var/lib/postgresql/data
2121

2222
volumes:
23-
deps:
24-
elixir_ls:
25-
build:
26-
node_modules:
2723
db:

.devcontainer/setup-container.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v1.0.2/zsh-in-docker.sh)"

.devcontainer/setup-dev.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
cp config/dev.exs.example config/dev.exs
4+
cp config/test.exs.example config/test.exs
5+
mix setup
6+
mix compile

.devcontainer/setup.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ npm-debug.log
3333
# this depending on your deployment strategy.
3434
/priv/static/
3535

36-
config/dev.exs
37-
config/test.exs
36+
config/*.local.exs

.vscode/extensions.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"recommendations": [
3+
"JakeBecker.elixir-ls",
4+
"esbenp.prettier-vscode",
5+
"dbaeumer.vscode-eslint",
6+
"bradlc.vscode-tailwindcss",
7+
"adrianwilczynski.alpine-js-intellisense",
8+
"stylelint.vscode-stylelint",
9+
"ms-azuretools.vscode-docker",
10+
"pantajoe.vscode-elixir-credo",
11+
"stkb.rewrap",
12+
"samuel-pordeus.elixir-test"
13+
]
14+
}

.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"css.validate": false,
3+
"editor.tabSize": 2,
34
"editor.formatOnSave": true,
45
"stylelint.configBasedir": "assets",
56
"files.associations": {
@@ -19,6 +20,9 @@
1920
"[postcss]": {
2021
"editor.defaultFormatter": "stylelint.vscode-stylelint"
2122
},
23+
"[elixir]": {
24+
"rewrap.autoWrap.enabled": true
25+
},
2226
"editor.codeActionsOnSave": {
2327
"source.fixAll": true
2428
},
@@ -30,6 +34,9 @@
3034
"tailwindCSS.includeLanguages": {
3135
"elixir": "javascript"
3236
},
37+
"elixirLS.suggestSpecs": true,
38+
"elixir.credo.configurationFile": ".credo.exs",
39+
"elixir.credo.ignoreWarningMessages": true,
3340
"tailwindCSS.emmetCompletions": true,
3441
"tailwindCSS.experimental.classRegex": ["class:\\s*\"([^\"]*)\""],
3542
"headwind.classRegex": {

config/dev.exs.example renamed to config/dev.exs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,5 @@ config :phoenix, :stacktrace_depth, 20
7575

7676
# Initialize plugs at runtime for faster development compilation
7777
config :phoenix, :plug_init_mode, :runtime
78+
79+
import_config "dev.local.exs"

0 commit comments

Comments
 (0)