From 2d3309a39a342c8cfe952a299e44c01b9e239775 Mon Sep 17 00:00:00 2001 From: Swapnil Devesh Date: Tue, 28 Jul 2020 06:12:12 +0530 Subject: [PATCH 1/2] Change local ip and fix build issues --- cloudpebble/Dockerfile | 2 +- cloudpebble/app.json | 4 ++-- cloudpebble/ide/templates/ide/project.html | 2 +- docker-compose.yml | 16 +++++++++------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cloudpebble/Dockerfile b/cloudpebble/Dockerfile index a343ede1..86cac7e3 100644 --- a/cloudpebble/Dockerfile +++ b/cloudpebble/Dockerfile @@ -23,7 +23,7 @@ RUN npm install -g npm jshint # Fix broken sources.list (jessie repositories have been archived) RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y --force-yes \ gettext \ postgresql-client libpq-dev \ --no-install-recommends && rm -rf /var/lib/apt/lists/* diff --git a/cloudpebble/app.json b/cloudpebble/app.json index b6620689..bfac7f98 100644 --- a/cloudpebble/app.json +++ b/cloudpebble/app.json @@ -32,12 +32,12 @@ "QEMU_LAUNCH_AUTH_HEADER": { "required": true }, - "QEMU_URLS": "http://192.168.76.5/qemu-us1.cloudpebble.net/", + "QEMU_URLS": "http://192.168.43.175/qemu-us1.cloudpebble.net/", "SDK2_PEBBLE_WAF": "/app/sdk2/pebble/waf", "SDK3_PEBBLE_WAF": "/app/sdk3/pebble/waf", "TYPOGRAPHY_CSS": "//cloud.typography.com/7515512/745724/css/fonts.css", "WEB_CONCURRENCY": "2", - "YCM_URLS": "https://192.168.76.5/ycm1.cloudpebble.net/" + "YCM_URLS": "https://192.168.43.175/ycm1.cloudpebble.net/" }, "addons": [ "papertrail:choklad", diff --git a/cloudpebble/ide/templates/ide/project.html b/cloudpebble/ide/templates/ide/project.html index 11b4e735..e207d791 100644 --- a/cloudpebble/ide/templates/ide/project.html +++ b/cloudpebble/ide/templates/ide/project.html @@ -17,7 +17,7 @@ {% endif %} - + diff --git a/docker-compose.yml b/docker-compose.yml index 2d0a752d..2528d085 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,11 +17,11 @@ web: - PORT=80 # On MAC - go to your settings -> Network -> copy IP address # NOTE: you can NOT use 127.0.0.1 or 0.0.0.0 because it will be the machine's IP address, not your PC's address - - AWS_S3_FAKE_S3=192.168.76.5:8003 - - MEDIA_URL=http://192.168.76.5:8003/builds.cloudpebble.net/ - - QEMU_URLS=http://192.168.76.5:8001/ - - YCM_URLS=http://192.168.76.5:8002/ - - PUBLIC_URL=http://192.168.76.5/ + - AWS_S3_FAKE_S3=192.168.43.175:8003 + - MEDIA_URL=http://192.168.43.175:8003/builds.cloudpebble.net/ + - QEMU_URLS=http://192.168.43.175:8001/ + - YCM_URLS=http://192.168.43.175:8002/ + - PUBLIC_URL=http://192.168.43.175/ - LIBPEBBLE_PROXY=wss://cloudpebble-ws.herokuapp.com/tool - PEBBLE_AUTH_URL=https://auth.rebble.io celery: @@ -36,8 +36,8 @@ celery: - DEBUG="yes" - RUN_CELERY="yes" - AWS_ENABLED=yes - - EXPORT_ROOT=http://192.168.76.5/export.cloudpebble.net/ - - AWS_S3_FAKE_S3=192.168.76.5:8003 + - EXPORT_ROOT=http://192.168.43.175/export.cloudpebble.net/ + - AWS_S3_FAKE_S3=192.168.43.175:8003 qemu: build: cloudpebble-qemu-controller/ volumes: @@ -54,6 +54,8 @@ redis: image: redis postgres: image: postgres + environment: + - POSTGRES_HOST_AUTH_METHOD=trust s3: image: kuracloud/fake-s3 ports: From 41a8663fea1caa1e9d2416029b3ccd7f33b87b18 Mon Sep 17 00:00:00 2001 From: Swapnil Devesh Date: Tue, 28 Jul 2020 06:12:52 +0530 Subject: [PATCH 2/2] Restore ip --- cloudpebble/app.json | 4 ++-- cloudpebble/ide/templates/ide/project.html | 2 +- docker-compose.yml | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cloudpebble/app.json b/cloudpebble/app.json index bfac7f98..b6620689 100644 --- a/cloudpebble/app.json +++ b/cloudpebble/app.json @@ -32,12 +32,12 @@ "QEMU_LAUNCH_AUTH_HEADER": { "required": true }, - "QEMU_URLS": "http://192.168.43.175/qemu-us1.cloudpebble.net/", + "QEMU_URLS": "http://192.168.76.5/qemu-us1.cloudpebble.net/", "SDK2_PEBBLE_WAF": "/app/sdk2/pebble/waf", "SDK3_PEBBLE_WAF": "/app/sdk3/pebble/waf", "TYPOGRAPHY_CSS": "//cloud.typography.com/7515512/745724/css/fonts.css", "WEB_CONCURRENCY": "2", - "YCM_URLS": "https://192.168.43.175/ycm1.cloudpebble.net/" + "YCM_URLS": "https://192.168.76.5/ycm1.cloudpebble.net/" }, "addons": [ "papertrail:choklad", diff --git a/cloudpebble/ide/templates/ide/project.html b/cloudpebble/ide/templates/ide/project.html index e207d791..11b4e735 100644 --- a/cloudpebble/ide/templates/ide/project.html +++ b/cloudpebble/ide/templates/ide/project.html @@ -17,7 +17,7 @@ {% endif %} - + diff --git a/docker-compose.yml b/docker-compose.yml index 2528d085..22c1b01f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,11 +17,11 @@ web: - PORT=80 # On MAC - go to your settings -> Network -> copy IP address # NOTE: you can NOT use 127.0.0.1 or 0.0.0.0 because it will be the machine's IP address, not your PC's address - - AWS_S3_FAKE_S3=192.168.43.175:8003 - - MEDIA_URL=http://192.168.43.175:8003/builds.cloudpebble.net/ - - QEMU_URLS=http://192.168.43.175:8001/ - - YCM_URLS=http://192.168.43.175:8002/ - - PUBLIC_URL=http://192.168.43.175/ + - AWS_S3_FAKE_S3=192.168.76.5:8003 + - MEDIA_URL=http://192.168.76.5:8003/builds.cloudpebble.net/ + - QEMU_URLS=http://192.168.76.5:8001/ + - YCM_URLS=http://192.168.76.5:8002/ + - PUBLIC_URL=http://192.168.76.5/ - LIBPEBBLE_PROXY=wss://cloudpebble-ws.herokuapp.com/tool - PEBBLE_AUTH_URL=https://auth.rebble.io celery: @@ -36,8 +36,8 @@ celery: - DEBUG="yes" - RUN_CELERY="yes" - AWS_ENABLED=yes - - EXPORT_ROOT=http://192.168.43.175/export.cloudpebble.net/ - - AWS_S3_FAKE_S3=192.168.43.175:8003 + - EXPORT_ROOT=http://192.168.76.5/export.cloudpebble.net/ + - AWS_S3_FAKE_S3=192.168.76.5:8003 qemu: build: cloudpebble-qemu-controller/ volumes: