From ed9ac1d609218748f8370e704f3dfe3cb3178053 Mon Sep 17 00:00:00 2001
From: Vladimir Osintsev <osintsev@gmail.com>
Date: Fri, 1 Apr 2022 12:28:55 +0300
Subject: [PATCH] Updates

---
 .github/workflows/rebase.yaml | 28 ++++++++++++++++++++++++++++
 Dockerfile                    |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/rebase.yaml

diff --git a/.github/workflows/rebase.yaml b/.github/workflows/rebase.yaml
new file mode 100644
index 0000000..c2b9aca
--- /dev/null
+++ b/.github/workflows/rebase.yaml
@@ -0,0 +1,28 @@
+name: Automatic rebase
+
+on:
+  issue_comment:
+    types:
+      - created
+
+jobs:
+  rebase:
+    name: Rebase
+    runs-on: ubuntu-latest
+    steps:
+      - uses: khan/pull-request-comment-trigger@master
+        id: check
+        with:
+          trigger: '/rebase'
+          reaction: rocket
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+      - uses: actions/checkout@v2
+        if: steps.check.outputs.triggered == 'true'
+        with:
+          fetch-depth: 0
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1
+        if: steps.check.outputs.triggered == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index ba82147..4600e3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ ENV ELECTRUM_NETWORK mainnet
 RUN mkdir -p /data ${ELECTRUM_HOME} && \
 	ln -sf /data ${ELECTRUM_HOME}/.electrum && \
 	chown ${ELECTRUM_USER} ${ELECTRUM_HOME}/.electrum /data
-=======
+
 # IMPORTANT: always verify gpg signature before changing a hash here!
 ENV ELECTRUM_CHECKSUM_SHA512 $CHECKSUM_SHA512
 
@@ -46,7 +46,7 @@ RUN mkdir -p /data \
 	    ${ELECTRUM_HOME}/.electrum/regtest/wallets/ \
 	    ${ELECTRUM_HOME}/.electrum/simnet/wallets/ && \
     ln -sf ${ELECTRUM_HOME}/.electrum/ /data && \
-	  chown -R ${ELECTRUM_USER} ${ELECTRUM_HOME}/.electrum /data
+	chown -R ${ELECTRUM_USER} ${ELECTRUM_HOME}/.electrum /data
 
 USER $ELECTRUM_USER
 WORKDIR $ELECTRUM_HOME