3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-28 13:06:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andrey Antukh 2021-03-31 12:24:10 +02:00
commit 8b45ed9c0c
26 changed files with 312 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docker/devenv/Dockerfile
View file

@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV NODE_VERSION=v14.16.0 \
CLOJURE_VERSION=1.10.3.814 \
CLJKONDO_VERSION=2021.03.22 \
BABASHKA_VERSION=0.3.0 \
BABASHKA_VERSION=0.3.1 \
LANG=en_US.UTF-8 \
LC_ALL=en_US.UTF-8
@ -151,6 +151,7 @@ EXPOSE 3449
EXPOSE 6060
EXPOSE 9090
COPY files/nginx.conf /etc/nginx/nginx.conf
COPY files/phantomjs-mock /usr/bin/phantomjs
COPY files/bashrc /root/.bashrc

1
docker/devenv/docker-compose.yaml
View file

@ -27,7 +27,6 @@ services:
volumes:
- "user_data:/home/penpot/"
- "${PWD}:/home/penpot/penpot"
- ./files/nginx.conf:/etc/nginx/nginx.conf
ports:
- 3447:3447

2
docker/devenv/files/nginx.conf
View file

@ -91,7 +91,7 @@ http {
location /internal/assets {
internal;
alias /home/penpot/penpot/backend/resources/public/assets;
alias /home/penpot/penpot/backend/assets;
add_header x-internal-redirect "$upstream_http_x_accel_redirect";
}

2
docker/devenv/files/start-tmux.sh
View file

@ -26,7 +26,9 @@ tmux send-keys -t penpot 'npx shadow-cljs watch main' enter
tmux new-window -t penpot:2 -n 'exporter'
tmux select-window -t penpot:2
tmux send-keys -t penpot 'cd penpot/exporter' enter C-l
tmux send-keys -t penpot 'rm -f target/app.js*' enter C-l
tmux send-keys -t penpot 'npx shadow-cljs watch main' enter
tmux split-window -v
tmux send-keys -t penpot 'cd penpot/exporter' enter C-l
tmux send-keys -t penpot './scripts/wait-and-start.sh' enter