Merge pull request #91 from kc3hack/main

リリースするぞ！

Author: taiseiue

.github/workflows/deploy-production.yaml

@@ -30,4 +30,4 @@ jobs:
         uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.RELEASE_NOTIFY_WEBHOOK }}
-          content: ":tada:リリースされました！\nURL: https://akane.yaken.org/"
+          content: "@here\n# :tada:リリースされました！\nURL: https://akane.yaken.org/"

.github/workflows/push-and-deploy.yaml

@@ -5,6 +5,16 @@ on:
     branches:
       - main
   workflow_dispatch:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    paths:
+      - "packages/akane-next/**"
+      - ".github/workflows/push-and-deploy.yaml"
+      - "docker/akane-next/**"
+      - "compose.yaml"
 
 jobs:
   next-build-and-push:
@@ -45,13 +55,13 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: ./packages/akane-next
+          context: .
           file: ./docker/akane-next/Dockerfile
           target: production
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          push: true
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
           provenance: false
           build-args: |
             DATABASE_URL=mysql://root@db:3306/akane
@@ -102,13 +112,14 @@ jobs:
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          push: true
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
           provenance: false
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
   deploy:
     name: Auto Deploy as Staging Environment
     needs: [next-build-and-push, nginx-build-and-push]
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Setup Tailscale

compose.yaml

@@ -1,16 +1,14 @@
 services:
   akane-next:
     build:
-      context: packages/akane-next
-      dockerfile: ../../docker/akane-next/Dockerfile
+      context: .
+      dockerfile: ./docker/akane-next/Dockerfile
       target: development
       args:
-        NODE_ENV: development
         DATABASE_URL: "mysql://root@db:3306/akane"
-        MAPBOX_MAP_STYLE: ""
-        MAPBOX_ACCESS_TOKEN: ""
+        MAPBOX_MAP_STYLE: "mapbox://styles/nenrin/cm77whskd00sl01reh909h23j"
+        MAPBOX_ACCESS_TOKEN: "pk.eyJ1IjoibmVucmluIiwiYSI6ImNtNzV1d3hoNTBpanoya3B2d3N0cGNtaTAifQ.8f7ecF34J0Zj0gdDrmaaVA"
     init: true
-    command: ["npm", "run", "dev"]
     ports:
       - "3800:3000"
       - "5555:5555" # for prisma studio

docker/akane-next/Dockerfile

@@ -17,9 +17,11 @@ ENV NEXT_PUBLIC_MAPBOX_ACCESS_TOKEN=${MAPBOX_ACCESS_TOKEN}
 USER node
 WORKDIR /app
 
+RUN mkdir -p /app/packages/akane-next
 COPY --chown=node:node package.json package-lock.json ./
+COPY --chown=node:node packages/akane-next/package.json ./packages/akane-next/
 
-RUN npm ci
+RUN npm install
 
 #
 # 開発環境向け
@@ -29,8 +31,9 @@ FROM base AS development
 USER node
 WORKDIR /app
 
-COPY --chown=node:node . .
+COPY --chown=node:node ./packages/akane-next ./packages/akane-next
 COPY --from=base --chown=node:node /app/node_modules ./node_modules
+WORKDIR /app/packages/akane-next
 
 RUN npm run prisma:generate
 
@@ -44,8 +47,9 @@ FROM base AS build
 RUN mkdir -p /app/.next
 
 WORKDIR /app
-COPY --chown=node:node . .
+COPY --chown=node:node ./packages/akane-next ./packages/akane-next
 COPY --from=base --chown=node:node /app/node_modules ./node_modules
+WORKDIR /app/packages/akane-next
 
 RUN npm run build
 
@@ -55,12 +59,12 @@ RUN npm run build
 FROM base AS production
 
 USER node
-WORKDIR /app
+WORKDIR /app/packages/akane-next
 
-COPY --chown=node:node --from=build /app/.next ./.next
-COPY --chown=node:node --from=build /app/public ./public
-COPY --chown=node:node --from=build /app/next.config.ts ./next.config.ts
-COPY --chown=node:node --from=build /app/package.json ./package.json
-COPY --chown=node:node --from=build /app/node_modules ./node_modules
+COPY --chown=node:node --from=build /app/packages/akane-next/.next ./.next
+COPY --chown=node:node --from=build /app/packages/akane-next/public ./public
+COPY --chown=node:node --from=build /app/packages/akane-next/next.config.ts ./next.config.ts
+COPY --chown=node:node --from=build /app/packages/akane-next/package.json ./package.json
+COPY --chown=node:node --from=build /app/node_modules ../../node_modules
 
-CMD ["npm", "start"]
+CMD ["npm", "start"]

docker/nginx/conf.d/admin.local.akane.yaken.org.conf

@@ -15,4 +15,8 @@ server {
     location /_next {
         proxy_pass http://akane-next:3000;
     }
+
+    location /admin {
+        proxy_pass http://akane-next:3000;
+    }
 }

docker/production/nginx/conf.d/admin-st-akane.yaken.org.conf docker/production/nginx/conf.d/admin-akane.yaken.org.conf

@@ -1,6 +1,6 @@
 server {
     listen 81;
-    server_name  admin-st-akane.yaken.org;
+    server_name  admin-akane.yaken.org;
 
     location / {
         proxy_pass http://akane-next:3000/admin;
@@ -9,5 +9,9 @@ server {
     location /_next {
         proxy_pass http://akane-next:3000;
     }
+    
+    location /admin {
+        proxy_pass http://akane-next:3000;
+    }
 
 }

docker/production/nginx/conf.d/st-akane.yaken.org.conf docker/production/nginx/conf.d/akane.yaken.org.conf

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name  st-akane.yaken.org;
+    server_name  akane.yaken.org;
 
     location / {
         proxy_pass http://akane-next:3000;