From 40d20490b1bb5057dcb1bccc70528714ee274b80 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Wed, 31 Jul 2019 09:22:15 +1000 Subject: [PATCH 1/8] branch --- infrastructure/git/scripts/environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/git/scripts/environment.sh b/infrastructure/git/scripts/environment.sh index 88c43af..7878ee3 100755 --- a/infrastructure/git/scripts/environment.sh +++ b/infrastructure/git/scripts/environment.sh @@ -9,5 +9,5 @@ fi echo export GIT_COMMITTER_EMAIL=${GIT_COMMITTER_EMAIL-$GIT_EMAIL} echo export GIT_COMMITTER_NAME=${GIT_COMMITTER_NAME-$GIT_NAME} -echo export CLOUD_COMPUTER_GIT_BRANCH=$(git branch --contains HEAD | cut -c 3-) +echo export CLOUD_COMPUTER_GIT_BRANCH=$(git branch --contains $(git describe --always) | grep \* | cut -c 3-) echo export CLOUD_COMPUTER_GIT_URL=$CLOUD_COMPUTER_GIT_URL From 5f6e89e7be25ca2c19e680ce892c406ac3216e51 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Wed, 31 Jul 2019 09:44:32 +1000 Subject: [PATCH 2/8] region --- infrastructure/terraform/cloud-computer/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/terraform/cloud-computer/variables.tf b/infrastructure/terraform/cloud-computer/variables.tf index 53f9127..70f509d 100644 --- a/infrastructure/terraform/cloud-computer/variables.tf +++ b/infrastructure/terraform/cloud-computer/variables.tf @@ -5,7 +5,7 @@ variable "cloud_provider_credentials_path" { variable "machine_region" { description = "The zone to create the machine in." - default = "europe-west3" + default = "australia-southeast1" } variable "machine_type" { From 23948e2173e515ce0306f6c3e4c6bbf766a79b07 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Fri, 2 Aug 2019 14:01:29 +1000 Subject: [PATCH 3/8] libcloudstorage --- .../containers/libcloudstorage/Dockerfile | 25 +++++++++++++++++++ infrastructure/containers/package.json | 1 + 2 files changed, 26 insertions(+) create mode 100644 infrastructure/containers/libcloudstorage/Dockerfile diff --git a/infrastructure/containers/libcloudstorage/Dockerfile b/infrastructure/containers/libcloudstorage/Dockerfile new file mode 100644 index 0000000..d7505a5 --- /dev/null +++ b/infrastructure/containers/libcloudstorage/Dockerfile @@ -0,0 +1,25 @@ +FROM ubuntu:19.04 + +# Install build dependencies +RUN apt-get update -qq && \ + apt-get install -qq \ + autoconf \ + curl \ + g++ \ + git \ + libfuse3-dev \ + libjsoncpp-dev \ + libmicrohttpd-dev \ + libtinyxml2-dev \ + libtool \ + make \ + pkg-config \ + python \ + wget + +# Build application +RUN git clone https://github.com/lemourin/libcloudstorage && \ + cd libcloudstorage && \ + ./bootstrap && \ + ./configure && \ + make diff --git a/infrastructure/containers/package.json b/infrastructure/containers/package.json index 054664c..0571dcd 100644 --- a/infrastructure/containers/package.json +++ b/infrastructure/containers/package.json @@ -14,6 +14,7 @@ "build:gnumeric": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/gnumeric $PWD/gnumeric", "build:krita": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/krita $PWD/krita", "build:kicad": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/kicad $PWD/kicad", + "build:libcloudstorage": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/libcloudstorage $PWD/libcloudstorage", "build:notion": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/notion $PWD/notion", "build:onlyoffice-word": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/onlyoffice-word $PWD/onlyoffice-word", "build:onlyoffice-excel": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/onlyoffice-excel $PWD/onlyoffice-excel", From 90911fc0ee117a939f253d868aaa39f531862a48 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Fri, 2 Aug 2019 14:19:02 +1000 Subject: [PATCH 4/8] build --- infrastructure/containers/libcloudstorage/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infrastructure/containers/libcloudstorage/Dockerfile b/infrastructure/containers/libcloudstorage/Dockerfile index d7505a5..b9e84ee 100644 --- a/infrastructure/containers/libcloudstorage/Dockerfile +++ b/infrastructure/containers/libcloudstorage/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update -qq && \ curl \ g++ \ git \ + libcurl4-openssl-dev \ libfuse3-dev \ libjsoncpp-dev \ libmicrohttpd-dev \ @@ -21,5 +22,5 @@ RUN apt-get update -qq && \ RUN git clone https://github.com/lemourin/libcloudstorage && \ cd libcloudstorage && \ ./bootstrap && \ - ./configure && \ + ./configure --with-curl --with-microhttpd --with-fuse && \ make From 8c17fe7f13e5e05dadb1cb430f8b29024f2dd367 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Fri, 2 Aug 2019 15:19:10 +1000 Subject: [PATCH 5/8] cloudstorage --- .../cloud-computer/scripts/environment.sh | 3 +++ .../Dockerfile | 3 ++- infrastructure/containers/package.json | 2 +- .../docker-compose/scripts/compose.sh | 1 + .../docker-compose/stacks/cloudstorage.yaml | 25 +++++++++++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) rename infrastructure/containers/{libcloudstorage => cloudstorage}/Dockerfile (94%) create mode 100644 infrastructure/docker-compose/stacks/cloudstorage.yaml diff --git a/infrastructure/cloud-computer/scripts/environment.sh b/infrastructure/cloud-computer/scripts/environment.sh index 86a7144..825233d 100755 --- a/infrastructure/cloud-computer/scripts/environment.sh +++ b/infrastructure/cloud-computer/scripts/environment.sh @@ -25,6 +25,7 @@ echo export CLOUD_COMPUTER_CREDENTIALS=/cloud-computer/credentials echo export CLOUD_COMPUTER_HOME=/cloud-computer/home echo export CLOUD_COMPUTER_NODEMON=/cloud-computer/nodemon echo export CLOUD_COMPUTER_REPOSITORY=/cloud-computer/cloud-computer +echo export CLOUD_COMPUTER_STORAGE=/cloud-computer/storage echo export CLOUD_COMPUTER_TERRAFORM=/cloud-computer/terraform echo export CLOUD_COMPUTER_TMUX=/cloud-computer/tmux echo export CLOUD_COMPUTER_X11=/tmp/.X11-unix @@ -34,7 +35,9 @@ echo export CLOUD_COMPUTER_CREDENTIALS_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COM echo export CLOUD_COMPUTER_HOME_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_HOME" echo export CLOUD_COMPUTER_NODEMON_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_NODEMON" echo export CLOUD_COMPUTER_REPOSITORY_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_REPOSITORY" +echo export CLOUD_COMPUTER_STORAGE_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_STORAGE" echo export CLOUD_COMPUTER_TERRAFORM_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_TERRAFORM" echo export CLOUD_COMPUTER_TMUX_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_TMUX" echo export CLOUD_COMPUTER_X11_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_X11" echo export CLOUD_COMPUTER_YARN_VOLUME="${COMPOSE_PROJECT_NAME}_CLOUD_COMPUTER_YARN" + diff --git a/infrastructure/containers/libcloudstorage/Dockerfile b/infrastructure/containers/cloudstorage/Dockerfile similarity index 94% rename from infrastructure/containers/libcloudstorage/Dockerfile rename to infrastructure/containers/cloudstorage/Dockerfile index b9e84ee..7e10192 100644 --- a/infrastructure/containers/libcloudstorage/Dockerfile +++ b/infrastructure/containers/cloudstorage/Dockerfile @@ -23,4 +23,5 @@ RUN git clone https://github.com/lemourin/libcloudstorage && \ cd libcloudstorage && \ ./bootstrap && \ ./configure --with-curl --with-microhttpd --with-fuse && \ - make + make && \ + make install diff --git a/infrastructure/containers/package.json b/infrastructure/containers/package.json index 0571dcd..bc3b168 100644 --- a/infrastructure/containers/package.json +++ b/infrastructure/containers/package.json @@ -14,7 +14,7 @@ "build:gnumeric": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/gnumeric $PWD/gnumeric", "build:krita": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/krita $PWD/krita", "build:kicad": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/kicad $PWD/kicad", - "build:libcloudstorage": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/libcloudstorage $PWD/libcloudstorage", + "build:cloudstorage": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/cloudstorage $PWD/cloudstorage", "build:notion": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/notion $PWD/notion", "build:onlyoffice-word": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/onlyoffice-word $PWD/onlyoffice-word", "build:onlyoffice-excel": "eval \"$(yarn --cwd ../cloud-computer environment)\"; yarn --cwd ../docker docker build --tag $CLOUD_COMPUTER_REGISTRY/onlyoffice-excel $PWD/onlyoffice-excel", diff --git a/infrastructure/docker-compose/scripts/compose.sh b/infrastructure/docker-compose/scripts/compose.sh index d13de3f..8e42eef 100755 --- a/infrastructure/docker-compose/scripts/compose.sh +++ b/infrastructure/docker-compose/scripts/compose.sh @@ -22,6 +22,7 @@ yarn --cwd ../docker docker run \ --env CLOUD_COMPUTER_IMAGE \ --env CLOUD_COMPUTER_NODEMON \ --env CLOUD_COMPUTER_REPOSITORY \ + --env CLOUD_COMPUTER_STORAGE \ --env CLOUD_COMPUTER_TERRAFORM \ --env CLOUD_COMPUTER_TMUX \ --env CLOUD_COMPUTER_X11 \ diff --git a/infrastructure/docker-compose/stacks/cloudstorage.yaml b/infrastructure/docker-compose/stacks/cloudstorage.yaml new file mode 100644 index 0000000..a88d36f --- /dev/null +++ b/infrastructure/docker-compose/stacks/cloudstorage.yaml @@ -0,0 +1,25 @@ +version: '3.5' + +services: + + cloudstorage: + image: cloudnativecomputer/cloudstorage:latest + command: cloudstorage-fuse $CLOUD_COMPUTER_STORAGE + restart: always + cap_add: + - SYS_ADMIN + devices: + - /dev/fuse + security_opt: + - apparmor:unconfined + environment: + CLOUD_COMPUTER_STORAGE: $CLOUD_COMPUTER_STORAGE + labels: + - traefik.enable=true + - traefik.frontend.rule=Host:cloudstorage.$CLOUD_COMPUTER_HOST_DNS + - traefik.port=12345 + volumes: + - CLOUD_COMPUTER_STORAGE:$CLOUD_COMPUTER_STORAGE + +volumes: + CLOUD_COMPUTER_STORAGE: From bd10812dc50380ab2b1d6268dc3d50e88c58382d Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Fri, 2 Aug 2019 17:32:59 +1000 Subject: [PATCH 6/8] storage --- infrastructure/docker-compose/stacks/krita.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/infrastructure/docker-compose/stacks/krita.yaml b/infrastructure/docker-compose/stacks/krita.yaml index e9b2447..e2693c6 100644 --- a/infrastructure/docker-compose/stacks/krita.yaml +++ b/infrastructure/docker-compose/stacks/krita.yaml @@ -12,6 +12,8 @@ services: - traefik.port=8080 volumes: - CLOUD_COMPUTER_HOME:$CLOUD_COMPUTER_HOME + - CLOUD_COMPUTER_STORAGE:$CLOUD_COMPUTER_STORAGE volumes: CLOUD_COMPUTER_HOME: + CLOUD_COMPUTER_STORAGE: From 7baf3525e23c0b27c68c01cea2e22502489e667f Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Tue, 6 Aug 2019 19:17:18 +1000 Subject: [PATCH 7/8] new-blender --- infrastructure/containers/blender/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure/containers/blender/Dockerfile b/infrastructure/containers/blender/Dockerfile index ea82955..577d0ea 100644 --- a/infrastructure/containers/blender/Dockerfile +++ b/infrastructure/containers/blender/Dockerfile @@ -1,8 +1,9 @@ FROM cloudnativecomputer/cloud-computer:latest # Install blender -RUN sudo apt-get update -qq && \ - sudo apt-get install -qq blender nvidia-cuda-toolkit +RUN wget -O blender.tar.bz2 -qnv https://builder.blender.org/download/blender-2.81-cdeda1fa6cea-linux-glibc217-x86_64.tar.bz2 && \ + tar xjf blender.tar.bz2 -C /opt --strip 1 && \ + rm blender.tar.bz2 # Start the application in vnc -CMD /cloud-computer/launcher-vnc.sh blender +CMD /cloud-computer/launcher-vnc.sh /opt/blender blender From 534395f2a57011a3be2230092d7904a3ccc23e48 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Wed, 14 Aug 2019 11:15:39 +1000 Subject: [PATCH 8/8] cloud --- infrastructure/containers/cloudstorage/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/containers/cloudstorage/Dockerfile b/infrastructure/containers/cloudstorage/Dockerfile index 7e10192..88fcbbf 100644 --- a/infrastructure/containers/cloudstorage/Dockerfile +++ b/infrastructure/containers/cloudstorage/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update -qq && \ wget # Build application -RUN git clone https://github.com/lemourin/libcloudstorage && \ +RUN git clone https://github.com/cloud-computer/libcloudstorage && \ cd libcloudstorage && \ ./bootstrap && \ ./configure --with-curl --with-microhttpd --with-fuse && \