diff --git a/.github/renovate/regex-manager.json5 b/.github/renovate/regex-manager.json5 index cf2e9b33e..56c4b6ce9 100644 --- a/.github/renovate/regex-manager.json5 +++ b/.github/renovate/regex-manager.json5 @@ -47,7 +47,7 @@ { "description": "GitHub URL dependencies", "fileMatch": [ - ".+\\.ya?ml$", "(^|/)Makefile$" + ".+\\.ya?ml$", "(^|/)Makefile$", "^Dockerfile.*" ], "matchStrings": [ // Example: kustomize build https://github.com/argoproj/argo-cd//manifests/crds?ref=v2.7.6 | kubectl create -f - diff --git a/compose.yaml b/compose.yaml index fff9f4070..23fa926cd 100644 --- a/compose.yaml +++ b/compose.yaml @@ -31,7 +31,9 @@ services: - app:/app/storage frontend: - image: caddy:2.8.4-alpine + build: + context: ./dev + dockerfile: Dockerfile-frontend restart: always expose: - "80" @@ -39,9 +41,6 @@ services: - "3000:80" depends_on: - backend - volumes: - - ./dev/Caddyfile:/etc/caddy/Caddyfile:ro - - ./dev/frontend:/usr/share/caddy:ro mysql: image: mariadb:10.11.10 diff --git a/dev/Dockerfile-frontend b/dev/Dockerfile-frontend new file mode 100644 index 000000000..cbea36fd1 --- /dev/null +++ b/dev/Dockerfile-frontend @@ -0,0 +1,5 @@ +FROM caddy:2.8.4-alpine + +COPY ./Caddyfile /etc/caddy/Caddyfile + +RUN wget -O - https://github.com/traPtitech/traQ_S-UI/releases/download/v3.22.1/dist.tar.gz | tar zxv -C /usr/share/caddy/ --strip-components=2 diff --git a/docs/development.md b/docs/development.md index 947ea1674..b49043dec 100644 --- a/docs/development.md +++ b/docs/development.md @@ -14,7 +14,7 @@ If you want to contribute to traQ, then follow this section. ### Setup Local Server with Docker #### First Up (or entirely rebuild) -`make update-frontend && make up` +`make up` Now you can access to + `http://localhost:3000` for traQ