fix dev env

univapay · Jul 30, 2023 · 3277a77 · 3277a77
1 parent 9bcc97b
commit 3277a77
Show file tree

Hide file tree

Showing 40 changed files with 41 additions and 123 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,21 @@
+{
+  "dockerComposeFile": ["../docker-compose.yml"],
+  "service": "web",
+  "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"
+      ]
+    }
+  }
+}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build
-        run: cd UnivaPay && tar -cvzf UnivaPay.tar.gz *
+        run: tar -cvzf UnivaPay.tar.gz *
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/.gitignore b/.gitignore
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/UnivaPay-for-EC-CUBE4.iml b/.idea/UnivaPay-for-EC-CUBE4.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/remote-mappings.xml b/.idea/remote-mappings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/...Pay/Controller/Admin/ConfigController.php → Controller/Admin/ConfigController.php b/...Pay/Controller/Admin/ConfigController.php → Controller/Admin/ConfigController.php
diff --git a/...aPay/Controller/Admin/OrderController.php → Controller/Admin/OrderController.php b/...aPay/Controller/Admin/OrderController.php → Controller/Admin/OrderController.php
diff --git a/...Pay/Controller/SubscriptionController.php → Controller/SubscriptionController.php b/...Pay/Controller/SubscriptionController.php → Controller/SubscriptionController.php
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,3 @@
+FROM ghcr.io/5ym/ec-cube:4.1
+RUN apk add git openssh-client
+COPY . /var/lib/nginx/html/app/Plugin/UnivaPay
diff --git a/UnivaPay/Entity/Config.php → Entity/Config.php b/UnivaPay/Entity/Config.php → Entity/Config.php
diff --git a/UnivaPay/Entity/CustomerTrait.php → Entity/CustomerTrait.php b/UnivaPay/Entity/CustomerTrait.php → Entity/CustomerTrait.php
diff --git a/UnivaPay/Entity/OrderTrait.php → Entity/OrderTrait.php b/UnivaPay/Entity/OrderTrait.php → Entity/OrderTrait.php
diff --git a/UnivaPay/Entity/ProductClassTrait.php → Entity/ProductClassTrait.php b/UnivaPay/Entity/ProductClassTrait.php → Entity/ProductClassTrait.php
diff --git a/UnivaPay/Entity/SubscriptionPeriod.php → Entity/SubscriptionPeriod.php b/UnivaPay/Entity/SubscriptionPeriod.php → Entity/SubscriptionPeriod.php
diff --git a/...ay/Form/Extension/CreditCardExtention.php → Form/Extension/CreditCardExtention.php b/...ay/Form/Extension/CreditCardExtention.php → Form/Extension/CreditCardExtention.php
diff --git a/...Extension/SubscriptionPeriodExtention.php → ...Extension/SubscriptionPeriodExtention.php b/...Extension/SubscriptionPeriodExtention.php → ...Extension/SubscriptionPeriodExtention.php
diff --git a/UnivaPay/Form/Type/Admin/ConfigType.php → Form/Type/Admin/ConfigType.php b/UnivaPay/Form/Type/Admin/ConfigType.php → Form/Type/Admin/ConfigType.php
diff --git a/...aPay/Form/Type/SubscriptionPeriodType.php → Form/Type/SubscriptionPeriodType.php b/...aPay/Form/Type/SubscriptionPeriodType.php → Form/Type/SubscriptionPeriodType.php
diff --git a/UnivaPay/PluginManager.php → PluginManager.php b/UnivaPay/PluginManager.php → PluginManager.php
diff --git a/README.md b/README.md
@@ -9,25 +9,28 @@ 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 web sh -c "bin/console eccube:install -n"
-docker compose exec web sh -c "bin/console eccube:composer:require univapay/php-sdk"
-docker compose exec web sh -c "bin/console eccube:plugin:install --code=UnivaPay && bin/console eccube:plugin:enable --code=UnivaPay && bin/console cache:clear"
+code . # devcontainerで開かなかったらdevcontainerで開きなおしてください
+bin/console eccube:install -n
+bin/console eccube:composer:require univapay/php-sdk
+bin/console eccube:plugin:install --code=UnivaPay && bin/console eccube:plugin:enable --code=UnivaPay && bin/console cache:clear
 ```
 
 <http://localhost:1080>
 
-#### データベース更新したとき
+### データベース更新したとき
 
 ```sh
-docker compose exec web sh -c "bin/console eccube:install -n && bin/console eccube:plugin:install --code=UnivaPay && bin/console eccube:plugin:enable --code=UnivaPay"
+bin/console eccube:install -n && bin/console eccube:plugin:install --code=UnivaPay && bin/console eccube:plugin:enable --code=UnivaPay
 ```
 
-#### 管理者向けアップデート手順
+### 管理者向けアップデート手順
 
 1. composer.json内のversionを上げる
 2. masterにコミット後github内でバージョンタグの作成
diff --git a/UnivaPay/Repository/ConfigRepository.php → Repository/ConfigRepository.php b/UnivaPay/Repository/ConfigRepository.php → Repository/ConfigRepository.php
diff --git a/...Repository/OrderSearchAdminCustomizer.php → Repository/OrderSearchAdminCustomizer.php b/...Repository/OrderSearchAdminCustomizer.php → Repository/OrderSearchAdminCustomizer.php
diff --git a/...pository/SubscriptionPeriodRepository.php → Repository/SubscriptionPeriodRepository.php b/...pository/SubscriptionPeriodRepository.php → Repository/SubscriptionPeriodRepository.php
diff --git a/UnivaPay/Resource/locale/messages.ja.yaml → Resource/locale/messages.ja.yaml b/UnivaPay/Resource/locale/messages.ja.yaml → Resource/locale/messages.ja.yaml
diff --git a/UnivaPay/Resource/template/admin/config.twig → Resource/template/admin/config.twig b/UnivaPay/Resource/template/admin/config.twig → Resource/template/admin/config.twig
diff --git a/...y/Resource/template/admin/order_edit.twig → Resource/template/admin/order_edit.twig b/...y/Resource/template/admin/order_edit.twig → Resource/template/admin/order_edit.twig
diff --git a/...Resource/template/admin/product_edit.twig → Resource/template/admin/product_edit.twig b/...Resource/template/admin/product_edit.twig → Resource/template/admin/product_edit.twig
diff --git a/...Pay/Resource/template/mypage_history.twig → Resource/template/mypage_history.twig b/...Pay/Resource/template/mypage_history.twig → Resource/template/mypage_history.twig
diff --git a/...y/Resource/template/shopping_confirm.twig → Resource/template/shopping_confirm.twig b/...y/Resource/template/shopping_confirm.twig → Resource/template/shopping_confirm.twig
diff --git a/UnivaPay/Service/Method/CreditCard.php → Service/Method/CreditCard.php b/UnivaPay/Service/Method/CreditCard.php → Service/Method/CreditCard.php
diff --git a/UnivaPay/Service/Method/Subscription.php → Service/Method/Subscription.php b/UnivaPay/Service/Method/Subscription.php → Service/Method/Subscription.php
diff --git a/UnivaPay/UnivaPayEvent.php → UnivaPayEvent.php b/UnivaPay/UnivaPayEvent.php → UnivaPayEvent.php
diff --git a/UnivaPay/Util/SDK.php → Util/SDK.php b/UnivaPay/Util/SDK.php → Util/SDK.php
diff --git a/UnivaPay/composer.json → composer.json b/UnivaPay/composer.json → composer.json
diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   web:
-    image: ghcr.io/5ym/ec-cube:4.1
+    build: .
     ports:
       - "1080:80"
     environment:
@@ -19,10 +19,14 @@ services:
       - ECCUBE_ADMIN_ROUTE=admin
       - ECCUBE_TEMPLATE_CODE=default
       - ECCUBE_LOCALE=ja
+      - SHELL=/bin/ash
     volumes:
-      - "./UnivaPay:/var/lib/nginx/html/app/Plugin/UnivaPay"
+      - ".:/var/lib/nginx/html/app/Plugin/UnivaPay"
     depends_on:
       - db
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
   db:
     image: postgres:10
     environment: