diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1856878..61ee66d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -43,10 +43,10 @@ "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached", "workspaceFolder": "/workspace", "mounts": [ - "source=decla-red-root-node_modules-volume,target=/workspace/node_modules,type=volume", - "source=decla-red-frontend-node_modules-volume,target=/workspace/frontend/node_modules,type=volume", - "source=decla-red-backend-node_modules-volume,target=/workspace/backend/node_modules,type=volume", - "source=decla-red-shared-node_modules-volume,target=/workspace/shared/node_modules,type=volume" + "source=decla-red-root-node_modules-volume2,target=/workspace/node_modules,type=volume", + "source=decla-red-frontend-node_modules-volume2,target=/workspace/frontend/node_modules,type=volume", + "source=decla-red-backend-node_modules-volume2,target=/workspace/backend/node_modules,type=volume", + "source=decla-red-shared-node_modules-volume2,target=/workspace/shared/node_modules,type=volume" ], "forwardPorts": [3000, 8080], "postCreateCommand": "chown node:node ./**/node_modules && npm install && npm run initialize && npm run build" diff --git a/.do/apps.yml b/.do/apps.yml new file mode 100644 index 0000000..0a41826 --- /dev/null +++ b/.do/apps.yml @@ -0,0 +1,15 @@ +name: decla-red-server +region: fra +services: + - dockerfile_path: Dockerfile + github: + branch: main + deploy_on_push: true + repo: schmelczerandras/decla.red + http_port: 3000 + instance_count: 1 + instance_size_slug: basic-xxs + run_command: node main.js --name=Frankfurt --seed=102 + name: decla-red-server + routes: + - path: / diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c4b95c6..69ccf48 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,7 +5,6 @@ on: - main env: CONTAINER_REGISTRY: schmelczera - DOMAIN: '174.138.103.56' jobs: build-project: @@ -38,17 +37,6 @@ jobs: - name: Build and push server image run: | docker buildx build \ - --tag $CONTAINER_REGISTRY/decla-red-server:latest \ + --tag $CONTAINER_REGISTRY/declared-server:latest \ --platform linux/amd64,linux/arm/v7,linux/arm64 . --push working-directory: backend - - name: Setup auth tokens - run: | - mkdir ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 - chmod 400 ~/.ssh/id_ed25519 - ssh -o StrictHostKeyChecking=no root@$DOMAIN uptime - - name: Stack deploy - run: | - DOCKER_HOST=ssh://root@$DOMAIN docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} - DOCKER_HOST=ssh://root@$DOMAIN docker stack deploy decla-red-server -c docker-compose.yml --with-registry-auth - working-directory: backend diff --git a/package.json b/package.json index d9875f5..39a8834 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ }, "dependencies": { "decla.red-frontend": "file:frontend", - "decla.red-server": "file:backend", "shared": "file:shared" }, "devDependencies": {