いったんためす

Author: taiseiue

.github/workflows/nginx-push-ghcr.yaml

@@ -2,8 +2,6 @@ name: nginx-push-ghcr
 
 on:
   push:
-    branches:
-      - main
   pull_request:
     types:
       - opened
@@ -54,8 +52,8 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: ./docker/nginx
-          file: ./docker/nginx/Dockerfile
+          context: ./docker/production/nginx
+          file: ./docker/production/nginx/Dockerfile
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

compose.yaml

@@ -5,7 +5,7 @@ services:
       dockerfile: ../../docker/akane-next/Dockerfile
     command: ["npm", "run", "dev"]
     ports:
-      - "3800:3000"
+      - "3000:3000"
       - "5555:5555" # for prisma studio
     develop:
       watch:
@@ -19,17 +19,17 @@ services:
           path: package.json
     environment:
       DATABASE_URL: "mysql://root@db:3306/akane"
-    depends_on:
-      - db
 
   nginx:
     image: nginx:latest
     build:
       context: docker/nginx
       dockerfile: ./Dockerfile
     ports:
+      - "80:80"
       - "443:443"
     depends_on:
+      - db
       - akane-next
 
   db:

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

@@ -0,0 +1,9 @@
+server {
+    listen 80;
+    server_name  admin.local.akane.yaken.org;
+
+    location / {
+        proxy_pass http://akane-next:3000/admin/;
+    }
+
+}

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

@@ -0,0 +1,13 @@
+server {
+    listen 80;
+    server_name  local.akane.yaken.org;
+
+    location / {
+        proxy_pass http://akane-next:3000/;
+    }
+
+    location /admin {
+        deny all;
+        return 403;
+    }
+}

docker/production/nginx/nginx.conf

@@ -0,0 +1,34 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections 2048;
+    multi_accept on;
+    use epoll;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    server_tokens off;
+    tcp_nopush on;
+    reset_timedout_connection on;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+    # コメントアウトしているが、問題がなければ有効にしてもいいだろう
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}