Skip to content

Commit

Permalink
🐳 fix: 修改配置文件
Browse files Browse the repository at this point in the history
  • Loading branch information
spcookie committed Dec 21, 2023
1 parent 6139b37 commit 8d56367
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 30 deletions.
32 changes: 7 additions & 25 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/java
{
"name": "Tokisaki",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"dockerComposeFile": [
"docker-compose.yaml"
],
"dockerComposeFile": "docker-compose.yaml",
"service": "devcontainer",
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "none",
"installMaven": "false",
"installGradle": "true"
}
}

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "java -version",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
"workspaceFolder": "/workspaces",
"forwardPorts": [
5005,
8080
],
"remoteUser": "root"
}
7 changes: 2 additions & 5 deletions .devcontainer/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ version: "3.4"
services:
devcontainer:
image: mcr.microsoft.com/devcontainers/java:1-17-bullseye
restart: unless-stopped
volumes:
- ../..:/workspaces
minio:
image: minio/minio
volumes:
Expand All @@ -15,8 +16,6 @@ services:
- "9000:9000"
- "9111:9001"
command: server --console-address ':9001' /tokisaki
privileged: true
restart: unless-stopped
postgres:
image: postgres
ports:
Expand All @@ -27,11 +26,9 @@ services:
POSTGRES_PASSWORD: root
POSTGRES_USER: postgres
POSTGRES_DB: Tokisaki
restart: unless-stopped
redis:
image: redis
command: redis-server --appendonly yes
restart: unless-stopped
volumes:
- redis-data:/data
ports:
Expand Down

0 comments on commit 8d56367

Please sign in to comment.