From 6b18b258a4a1f3f8cfa98ed512337e4284407f88 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 4 Feb 2022 16:02:51 +0100 Subject: [PATCH 1/7] :bug: Set proper default http server host. --- backend/src/app/config.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 71ee82fbe..199f067e0 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -42,7 +42,7 @@ (def defaults {:http-server-port 6060 - :http-server-host "localhost" + :http-server-host "0.0.0.0" :host "devenv" :tenant "dev" :database-uri "postgresql://postgres/penpot" From c91e2d13c05e70ed1ce676e2986869e724169367 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 6 Feb 2022 23:40:04 +0100 Subject: [PATCH 2/7] :paperclip: Add temporal workaround on config.env file --- docker/images/config.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/images/config.env b/docker/images/config.env index 2a4c2d4cd..d6e468640 100644 --- a/docker/images/config.env +++ b/docker/images/config.env @@ -1,6 +1,9 @@ # Should be set to the public domain where penpot is going to be served. PENPOT_PUBLIC_URI=http://localhost:9001 +# Temporal workaround because of bad builtin default +PENPOT_HTTP_SERVER_HOST=0.0.0.0 + # Standard database connection parameters (only postgresql is supported): PENPOT_DATABASE_URI=postgresql://penpot-postgres/penpot PENPOT_DATABASE_USERNAME=penpot From 341caa3489782740aa56b4f03d123b219ed91ab8 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 7 Feb 2022 11:21:54 +0100 Subject: [PATCH 3/7] :tada: Add docker images auxiliar build script. --- docker/images/build.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 docker/images/build.sh diff --git a/docker/images/build.sh b/docker/images/build.sh new file mode 100644 index 000000000..488de5e52 --- /dev/null +++ b/docker/images/build.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +set -x + +DOCKER_CLI_EXPERIMENTAL=enabled +ORG=${PENPOT_DOCKER_NAMESPACE:-penpotapp}; +PLATFORM=${PENPOT_BUILD_PLATFORM:-linux/amd64}; +IMAGE=${1:-backend}; + +DOCKER_IMAGE="$ORG/$IMAGE"; +OPTIONS="-t $DOCKER_IMAGE:$PENPOT_BUILD_BRANCH"; + +IFS=", " +read -a TAGS <<< $PENPOT_BUILD_TAGS; + +for element in "${TAGS[@]}"; do + OPTIONS="$OPTIONS -t $DOCKER_IMAGE:$element"; +done + +if [ "$PENPOT_BUILD_PUSH" = "true" ]; then + OPTIONS="--push $OPTIONS" +else + OPTIONS="--load $OPTIONS" +fi + +docker buildx inspect penpot > /dev/null 2>&1; +docker run --privileged --rm tonistiigi/binfmt --install all + +if [ $? -eq 1 ]; then + docker buildx create --name=penpot --use + docker buildx inspect --bootstrap > /dev/null 2>&1; +else + docker buildx use penpot; + docker buildx inspect --bootstrap > /dev/null 2>&1; +fi + +unset IFS; +docker buildx build --platform ${PLATFORM// /,} $OPTIONS -f Dockerfile.$IMAGE .; From 46250e6fabbb5c85642f8435be96efbd4d23c006 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 7 Feb 2022 11:40:53 +0100 Subject: [PATCH 4/7] :arrow_up: Update nodejs version on docker images. --- docker/images/Dockerfile.exporter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter index 84cd010bb..fb57da760 100644 --- a/docker/images/Dockerfile.exporter +++ b/docker/images/Dockerfile.exporter @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ENV LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \ - NODE_VERSION=v14.17.5 \ + NODE_VERSION=v16.13.1 \ PENPOT_BROWSER_EXECUTABLE_PATH=/usr/bin/chromium RUN set -ex; \ From cdc91feb28d14dc8d2e5d523bce49b981233bfe3 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 7 Feb 2022 17:48:51 +0100 Subject: [PATCH 5/7] :bug: Fix Firefox problem when rendering frames --- .../src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs b/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs index 8b53a9e21..6e0ff85fe 100644 --- a/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/thumbnail_renderer.cljs @@ -43,6 +43,8 @@ svg-node (.createElementNS js/document "http://www.w3.org/2000/svg" "svg") _ (.setAttribute svg-node "version" "1.1") _ (.setAttribute svg-node "viewBox" (str (:x shape) " " (:y shape) " " (:width shape) " " (:height shape))) + _ (.setAttribute svg-node "width" (:width shape)) + _ (.setAttribute svg-node "height" (:height shape)) _ (unchecked-set svg-node "innerHTML" frame-html) xml (-> (js/XMLSerializer.) (.serializeToString svg-node) From 0632028579b3e8b90f545a93fc8c2362f41b4fa5 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 7 Feb 2022 23:26:21 +0100 Subject: [PATCH 6/7] :paperclip: Set version to 1.11.1-beta --- CHANGES.md | 12 ++++++++++++ version.txt | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e94e1f178..03e16ee97 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,17 @@ # CHANGELOG +## 1.11.1-beta + +### :bug: Bugs fixed + +- Fix issue related to default http host config value. +- Fix issue on rendering frames on firefox. + +### :arrow_up: Deps updates + +- Update nodejs version to 16.13.1 on docker images. + + ## 1.11.0-beta ### :boom: Breaking changes diff --git a/version.txt b/version.txt index 4beb19d04..792a1e887 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.11.0-beta +1.11.1-beta From 2c25dfcf1b23a7affcfd6bdcd9fe20d35c44a501 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 7 Feb 2022 23:42:26 +0100 Subject: [PATCH 7/7] :paperclip: Add exec perms to build script --- docker/images/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/images/build.sh diff --git a/docker/images/build.sh b/docker/images/build.sh old mode 100644 new mode 100755