Skip to content

Commit

Permalink
Fixed endless compilation devcontainer, debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
road42 committed Aug 28, 2019
1 parent 4b06e21 commit dbdb26a
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 7 deletions.
15 changes: 14 additions & 1 deletion .devcontainer/Dockerfile
@@ -1,7 +1,7 @@
FROM ubuntu:disco
LABEL maintainer="sgr"

ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates"
ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates iproute2"
ENV DEBIAN_FRONTEND=noninteractive

ENV \
Expand Down Expand Up @@ -145,3 +145,16 @@ RUN set -o xtrace \
&& sh /home/wekan/install-meteor.sh

ENV PATH=$PATH:$HOME/.meteor/

# Copy source dir
USER root

RUN set -o xtrace \
&& mkdir /home/wekan/app

COPY ${SRC_PATH} /home/wekan/app/

RUN set -o xtrace \
&& chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor

USER wekan
4 changes: 2 additions & 2 deletions .devcontainer/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash

cd /app
cd /home/wekan/app
rm -rf node_modules
/home/wekan/.meteor/meteor npm install
rm -rf .build
Expand All @@ -9,4 +9,4 @@ cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/pa
cd .build/bundle/programs/server
rm -rf node_modules
/home/wekan/.meteor/meteor npm install
cd /app
cd /home/wekan/app
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Expand Up @@ -2,7 +2,7 @@
{
"dockerComposeFile": "docker-compose.yml",
"service": "wekan-dev",
"workspaceFolder": "/app",
"workspaceFolder": "/home/wekan/app",
"extensions": [
"mutantdino.resourcemonitor",
"editorconfig.editorconfig",
Expand Down
6 changes: 3 additions & 3 deletions .devcontainer/docker-compose.yml
Expand Up @@ -21,8 +21,8 @@ services:
networks:
- wekan-dev-tier
build:
context: .
dockerfile: Dockerfile
context: ..
dockerfile: .devcontainer/Dockerfile
ports:
- 3000:3000
- 9229:9229
Expand All @@ -38,7 +38,7 @@ services:
depends_on:
- wekandb-dev
volumes:
- ..:/app
- ..:/app:delegated
command:
sleep infinity

Expand Down
28 changes: 28 additions & 0 deletions .vscode/launch.json
@@ -0,0 +1,28 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Meteor: Chrome",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}"
},
{
"type": "node",
"request": "launch",
"name": "Meteor: Node",
"runtimeExecutable": "/home/wekan/.meteor/meteor",
"runtimeArgs": ["run", "--inspect-brk=9229"],
"outputCapture": "std",
"port": 9229,
"timeout": 60000
}
],
"compounds": [
{
"name": "Meteor: All",
"configurations": ["Meteor: Node", "Meteor: Chrome"]
}
]
}

0 comments on commit dbdb26a

Please sign in to comment.