From 49cacb9abf134b5db71fb0a45477bd7fa9db1388 Mon Sep 17 00:00:00 2001
From: Pawel Lipski <pawel.p.lipski@gmail.com>
Date: Sat, 19 Dec 2020 23:08:41 +0100
Subject: [PATCH] Fix Docker image used to open a PR to nixpkgs

---
 RELEASE_NOTES.md                          |  4 ++++
 ci/nixpkgs-pr/Dockerfile                  | 22 +++-------------------
 ci/nixpkgs-pr/build-context/entrypoint.sh |  4 ++--
 git_machete/__init__.py                   |  2 +-
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 15ec42633..c0dd08b78 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release notes
 
+## New in git-machete 2.15.9
+
+- fixed: Docker image used to open a PR to nixpkgs
+
 ## New in git-machete 2.15.8
 
 - improved: both `master` (or `main`) and `develop` are automatically treated as roots in `discover`
diff --git a/ci/nixpkgs-pr/Dockerfile b/ci/nixpkgs-pr/Dockerfile
index 79c3ff7fc..ab03f53bd 100644
--- a/ci/nixpkgs-pr/Dockerfile
+++ b/ci/nixpkgs-pr/Dockerfile
@@ -1,25 +1,9 @@
 FROM nixos/nix
 
-RUN nix-env -i bash curl git jq
-
-WORKDIR /root
-RUN set -x \
-    && git clone --depth=1 https://github.com/github/hub.git \
-    && cd /root/hub/ \
-    && nix-env -i go gnumake \
-    && make bin/hub \
-    && nix-env -e go gnumake \
-    && nix-collect-garbage -d \
-    && mkdir -p /usr/local/bin/ \
-    && cp bin/hub /usr/local/bin/ \
-    && cd /root \
-    && rm -r hub/
-ENV PATH=$PATH:/usr/local/bin
-RUN hub --version
-
-RUN mkdir /root/nixpkgs
-WORKDIR /root/nixpkgs
+RUN nix-env -i bash curl git hub jq
 
 COPY pr-description.md entrypoint.sh /root/
 RUN chmod +x /root/entrypoint.sh
 ENTRYPOINT /root/entrypoint.sh
+
+WORKDIR /root/nixpkgs
diff --git a/ci/nixpkgs-pr/build-context/entrypoint.sh b/ci/nixpkgs-pr/build-context/entrypoint.sh
index a6a0ab607..98575752f 100755
--- a/ci/nixpkgs-pr/build-context/entrypoint.sh
+++ b/ci/nixpkgs-pr/build-context/entrypoint.sh
@@ -40,5 +40,5 @@ hub pull-request \
   --head VirtusLab:$branch \
   --message "$message" \
   --labels='10.rebuild-darwin: 1-10,10.rebuild-linux: 1-10,11.by: upstream-developer'
-# Deliberately not setting --reviewer (not needed + caused non-trivial issues with access of personal OAuth token to organization-owned repo:
-# it could create a PR but could not set a reviewer, see https://travis-ci.com/VirtusLab/git-machete/jobs/657256851).
+# Deliberately not setting `--reviewer`, since it's not strictly needed
+# and caused non-trivial issues with access of personal OAuth token to organization-owned repo.
diff --git a/git_machete/__init__.py b/git_machete/__init__.py
index 0578ccb6a..0ff7778c6 100644
--- a/git_machete/__init__.py
+++ b/git_machete/__init__.py
@@ -1 +1 @@
-__version__ = '2.15.8'
+__version__ = '2.15.9'