From 84045e929ddaa19286744393f09f02acb7cb607e Mon Sep 17 00:00:00 2001
From: echaz <eric.chazan@gmail.com>
Date: Sun, 27 Feb 2022 18:19:49 -0500
Subject: [PATCH 1/5] Added Dockerfile

---
 Dockerfile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..1a6f75b3b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,25 @@
+# Instructions for getting rednotebook working on macos with x:
+# https://gist.github.com/paul-krohn/e45f96181b1cf5e536325d1bdee6c949
+
+# For windows, you have something like cygwin that you can use
+
+# 1) install xwindows on your machine, and run it with a script like startx
+# % docker build . --tag rednotebook:LATEST
+# % export REDNOTEBOOK_HOME=<select a directory for your journal> && mkdir $REDNOTEBOOK_HOME
+
+# 2) startup rednotebnook:
+# % docker run --rm -e DISPLAY=host.docker.internal:0 -it --volume ${REDNOTEBOOK_HOME}:/root/.rednotebook rednotebook:LATEST
+
+# You can update to the latest release of rednotebook by running "docker build" again.
+
+FROM ubuntu:latest
+RUN apt-get update
+RUN apt install -y software-properties-common
+RUN add-apt-repository ppa:rednotebook/stable
+RUN apt-get update
+RUN apt-get install -y rednotebook adwaita-icon-theme-full
+
+# Hides GTK accessibility warnings
+ENV NO_AT_BRIDGE=1
+
+CMD ["/usr/bin/rednotebook"]

From 79041204597a2c083862a7b944d99230e511d74d Mon Sep 17 00:00:00 2001
From: echaz <eric.chazan@gmail.com>
Date: Sun, 27 Feb 2022 18:42:27 -0500
Subject: [PATCH 2/5] updated changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac08de11e..2cbcbb39a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# next (unreleased)
+* Added a dockerfile (#614 Eric Chazan)
+
 # 2.24 (2022-02-21)
 * Revert to plain naming scheme for data files since reverse DNS naming causes problems (#611, Phil Wyett).
 

From 8e04e7b4ae774cd318e822f9ef53cdb9712a865a Mon Sep 17 00:00:00 2001
From: Jendrik Seipp <jendrikseipp@gmail.com>
Date: Mon, 28 Feb 2022 12:04:56 +0100
Subject: [PATCH 3/5] Update Dockerfile

---
 Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a6f75b3b..7e1cba007 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-# Instructions for getting rednotebook working on macos with x:
+# Instructions for getting RedNotebook working on macOS with X:
 # https://gist.github.com/paul-krohn/e45f96181b1cf5e536325d1bdee6c949
 
-# For windows, you have something like cygwin that you can use
+# For Windows, you have something like Cygwin that you can use.
 
-# 1) install xwindows on your machine, and run it with a script like startx
-# % docker build . --tag rednotebook:LATEST
-# % export REDNOTEBOOK_HOME=<select a directory for your journal> && mkdir $REDNOTEBOOK_HOME
+# 1) Install xwindows on your machine, and run it with a script like startx.
+# $ docker build . --tag rednotebook:LATEST
+# $ export REDNOTEBOOK_HOME=<select a directory for your journal> && mkdir $REDNOTEBOOK_HOME
 
-# 2) startup rednotebnook:
-# % docker run --rm -e DISPLAY=host.docker.internal:0 -it --volume ${REDNOTEBOOK_HOME}:/root/.rednotebook rednotebook:LATEST
+# 2) Start RedNotebook:
+# $ docker run --rm -e DISPLAY=host.docker.internal:0 -it --volume ${REDNOTEBOOK_HOME}:/root/.rednotebook rednotebook:LATEST
 
-# You can update to the latest release of rednotebook by running "docker build" again.
+# You can update to the latest RedNotebook release by running "docker build" again.
 
 FROM ubuntu:latest
 RUN apt-get update
@@ -19,7 +19,7 @@ RUN add-apt-repository ppa:rednotebook/stable
 RUN apt-get update
 RUN apt-get install -y rednotebook adwaita-icon-theme-full
 
-# Hides GTK accessibility warnings
+# Hide GTK accessibility warnings.
 ENV NO_AT_BRIDGE=1
 
 CMD ["/usr/bin/rednotebook"]

From 1439ae38202c0e25a3439f564b6cbdc95a739598 Mon Sep 17 00:00:00 2001
From: Jendrik Seipp <jendrikseipp@gmail.com>
Date: Mon, 28 Feb 2022 12:05:28 +0100
Subject: [PATCH 4/5] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cbcbb39a..001a0d8e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # next (unreleased)
-* Added a dockerfile (#614 Eric Chazan)
+* Add a dockerfile (#614, Eric Chazan).
 
 # 2.24 (2022-02-21)
 * Revert to plain naming scheme for data files since reverse DNS naming causes problems (#611, Phil Wyett).

From 3e08ca5fb7a20dda845e9ad78f92f65a67bf69fe Mon Sep 17 00:00:00 2001
From: Jendrik Seipp <jendrikseipp@gmail.com>
Date: Mon, 28 Feb 2022 12:09:08 +0100
Subject: [PATCH 5/5] Update Dockerfile

---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e1cba007..6be94815f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,12 @@
-# Instructions for getting RedNotebook working on macOS with X:
-# https://gist.github.com/paul-krohn/e45f96181b1cf5e536325d1bdee6c949
+# 1) Install Docker:
+#   For macOS, see https://gist.github.com/paul-krohn/e45f96181b1cf5e536325d1bdee6c949.
+#   For Windows, you can use something like Cygwin.
 
-# For Windows, you have something like Cygwin that you can use.
-
-# 1) Install xwindows on your machine, and run it with a script like startx.
+# 2) Install xwindows on your machine, and run it with a script like startx.
 # $ docker build . --tag rednotebook:LATEST
 # $ export REDNOTEBOOK_HOME=<select a directory for your journal> && mkdir $REDNOTEBOOK_HOME
 
-# 2) Start RedNotebook:
+# 3) Start RedNotebook:
 # $ docker run --rm -e DISPLAY=host.docker.internal:0 -it --volume ${REDNOTEBOOK_HOME}:/root/.rednotebook rednotebook:LATEST
 
 # You can update to the latest RedNotebook release by running "docker build" again.