0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 02:28:18 -05:00

Merge remote-tracking branch 'origin/main' into develop

This commit is contained in:
Andrey Antukh 2022-02-08 09:12:13 +01:00
commit 979f61df99
6 changed files with 55 additions and 2 deletions

View file

@ -31,6 +31,17 @@
### :arrow_up: Deps updates
### :heart: Community contributions by (Thank you!)
## 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
### :sparkles: New features

View file

@ -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"

View file

@ -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; \

37
docker/images/build.sh Executable file
View file

@ -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 .;

View file

@ -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

View file

@ -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)