Skip to content

Commit

Permalink
fix dev env
Browse files Browse the repository at this point in the history
  • Loading branch information
5ym committed Jul 29, 2023
1 parent c9c34a9 commit edc714f
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 7 deletions.
10 changes: 9 additions & 1 deletion .devcontainer/devcontainer.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,18 @@
"workspaceFolder": "/var/lib/nginx/html/app/Plugin/UnivaPay",
"customizations": {
"vscode": {
"settings": {
"php.validate.enable": false,
"php.suggest.basic": false,
"[php]": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
}
},
"extensions": [
"bmewburn.vscode-intelephense-client",
"ms-azuretools.vscode-docker"
]
}
}
}
}
Empty file modified .gitignore
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM ghcr.io/5ym/ec-cube:4.1
RUN apk add git openssh-client
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ UnivaPayの申し込み方法
vscode devcontainerを利用しています。

```sh
git clone https://github.com/univapaycast/UnivaPay-for-EC-CUBE4.git
git clone https://github.com/univapay/UnivaPay-for-EC-CUBE4.git
cd UnivaPay-for-EC-CUBE4
cp docker-compose.sample.yml docker-compose.yml
docker compose up -d
docker compose exec --user root web sh -c "chwon -R nginx:nginx"
code . # devcontainerで開かなかったらdevcontainerで開きなおしてください
bin/console eccube:install -n
bin/console eccube:composer:require univapay/php-sdk
Expand Down
13 changes: 9 additions & 4 deletions docker-compose.sample.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
web:
image: ghcr.io/5ym/ec-cube:4.1
build: .
ports:
- "1080:80"
environment:
Expand All @@ -19,10 +19,14 @@ services:
- ECCUBE_ADMIN_ROUTE=admin
- ECCUBE_TEMPLATE_CODE=default
- ECCUBE_LOCALE=ja
volumes:
- ".:/var/lib/nginx/html/app/Plugin/UnivaPay"
- SHELL=/bin/ash
depends_on:
- db
dns:
- 1.1.1.1
- 1.0.0.1
volumes:
- .:/var/lib/nginx/html/app/Plugin/UnivaPay
db:
image: postgres:10
environment:
Expand All @@ -36,4 +40,5 @@ services:
- "2080:8025"

volumes:
db:
db:
web:

0 comments on commit edc714f

Please sign in to comment.