From 1a16e8be32b6ebe708da45712a3d8041f1dea3f8 Mon Sep 17 00:00:00 2001
From: Graydon Hoare ${binary} on ${hostname} crashed at ${formatted_time} with the
+ following backtraces: ${binary} on ${hostname} crashed at ${formatted_time} with the
- following backtraces: ${binary} on ${hostname} crashed at ${formatted_time} with the
+ following backtraces: ${binary} on ${hostname} crashed at ${formatted_time} with the
- following backtraces:
+
+
+ ${trace}
+
Extracted logs
+
+
+ """)
+ body = Template(template).substitute(template_vars)
+
+ logging.info("Sending core alert from %s to %s", sender, recipient)
+ conn = boto.ses.connect_to_region(self.config.get('Config', 'region'))
+ conn.send_email(sender, subject, None, [recipient], html_body=body)
+
+ def run(self):
+ core = self.find_core()
+ logging.info('Found core file %s', core)
+ epoch_time = os.path.getctime(core)
+ logs = self.find_logs(epoch_time)
+ trace = self.get_trace(core)
+ self.send_alert(epoch_time, trace, logs)
+
+if __name__ == "__main__":
+ if len(sys.argv) > 1:
+ config_file = sys.argv[1]
+ else:
+ config_file = "/etc/coremailer.ini"
+
+ logging.basicConfig(level=logging.INFO)
+
+ config = ConfigParser.ConfigParser({
+ "region": "us-east-1",
+ "cores": "/cores",
+ "log": "/logs/syslog",
+ "hostname": socket.gethostname(),
+ "from": "ops+%(hostname)s@stellar.org",
+ "to": "ops@stellar.org",
+ "bin": "/usr/local/bin/stellar-core"
+ })
+ config.add_section("Config")
+ config.read(config_file)
+
+ mailer = CoreMailer(config)
+ mailer.run()
From 7e92149d01f99732607bb4b41cffb453cb847712 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
+ ${logs}
+
-
-
- ${trace}
-
Extracted logs
-
-
- """)
- body = Template(template).substitute(template_vars)
-
- logging.info("Sending core alert from %s to %s", sender, recipient)
- conn = boto.ses.connect_to_region(self.config.get('Config', 'region'))
- conn.send_email(sender, subject, None, [recipient], html_body=body)
-
- def archive_core(self, core):
- command_string = self.config.get('Config', 'archive_command')
- if command_string:
- core_path = os.path.join(self.hostname, os.path.basename(core))
- command_string = command_string.format(core, core_path)
- logging.info(subprocess.check_output(command_string.split(' ')))
- else:
- logging.warn("No archive command, just removing core file")
- os.remove(core)
-
- def run(self):
- core = self.find_core()
- if core:
- logging.info('Found core file %s', core)
- epoch_time = os.path.getctime(core)
- logs = self.find_logs(epoch_time)
- trace = self.get_trace(core)
- self.send_alert(epoch_time, trace, logs)
- self.archive_core(core)
- else:
- logging.info('No core file found for processing')
-
-if __name__ == "__main__":
- if len(sys.argv) > 1:
- config_file = sys.argv[1]
- else:
- config_file = "/etc/coremailer.ini"
-
- logging.basicConfig(level=logging.INFO)
-
- config = ConfigParser.ConfigParser({
- "region": "us-east-1",
- "cores": "/cores",
- "log": "/logs/host/syslog",
- "hostname": socket.gethostname(),
- "from": "ops+%(hostname)s@stellar.org",
- "to": os.environ.get('CORE_ALERT_RECIPIENT'),
- "bin": "/usr/local/bin/stellar-core",
- "archive_command": os.environ.get('CORE_ARCHIVE_COMMAND')
- })
- config.add_section("Config")
- config.read(config_file)
-
- mailer = CoreMailer(config)
- mailer.run()
From 8f89c2e99e7a7a4edb4f3cba56ae6775bde32147 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
- ${logs}
-
+
+
+ ${trace}
+
Extracted logs
+
+
+ """)
+ body = Template(template).substitute(template_vars)
+
+ logging.info("Sending core alert from %s to %s", sender, recipient)
+ conn = boto.ses.connect_to_region(self.config.get('Config', 'region'))
+ conn.send_email(sender, subject, None, [recipient], html_body=body)
+
+ def archive_core(self, core):
+ command_string = self.config.get('Config', 'archive_command')
+ if command_string:
+ core_path = os.path.join(self.hostname, os.path.basename(core))
+ command_string = command_string.format(core, core_path)
+ logging.info(subprocess.check_output(command_string.split(' ')))
+ else:
+ logging.warn("No archive command, just removing core file")
+ os.remove(core)
+
+ def run(self):
+ core = self.find_core()
+ if core:
+ logging.info('Found core file %s', core)
+ epoch_time = os.path.getctime(core)
+ logs = self.find_logs(epoch_time)
+ trace = self.get_trace(core)
+ self.send_alert(epoch_time, trace, logs)
+ self.archive_core(core)
+ else:
+ logging.info('No core file found for processing')
+
+if __name__ == "__main__":
+ if len(sys.argv) > 1:
+ config_file = sys.argv[1]
+ else:
+ config_file = "/etc/coremailer.ini"
+
+ logging.basicConfig(level=logging.INFO)
+
+ config = ConfigParser.ConfigParser({
+ "region": "us-east-1",
+ "cores": "/cores",
+ "log": "/logs/host/syslog",
+ "hostname": socket.gethostname(),
+ "from": "ops+%(hostname)s@stellar.org",
+ "to": os.environ.get('CORE_ALERT_RECIPIENT'),
+ "bin": "/usr/local/bin/stellar-core",
+ "archive_command": os.environ.get('CORE_ARCHIVE_COMMAND')
+ })
+ config.add_section("Config")
+ config.read(config_file)
+
+ mailer = CoreMailer(config)
+ mailer.run()
From f673228c6c36ab2f7cc66578af2347a4e4a65bbf Mon Sep 17 00:00:00 2001
From: Mat Schaffer
+ ${logs}
+
${trace}
@@ -109,19 +110,20 @@ def send_alert(self, epoch_time, trace, logs):
def send_email(self, sender, recipient, subject, body):
conn = boto.ses.connect_to_region(self.config.get('Config', 'region'))
+ # noinspection PyTypeChecker
conn.send_email(sender, subject, None, [recipient], html_body=body)
def output_trace(self, epoch_time, trace):
template_vars = {
"hostname": self.hostname,
"binary": self.config.get('Config', 'bin'),
- "formatted_time": self.format_time(epoch_time),
+ "formatted_time": format_time(epoch_time),
"trace": trace
}
template = textwrap.dedent("""
${binary} on ${hostname} crashed at ${formatted_time} with the
- following backtraces:
+ following back traces:
${trace}
""")
@@ -159,15 +161,16 @@ def run(self):
else:
logging.info('No core file found for processing')
+
if __name__ == "__main__":
if len(sys.argv) > 1:
config_file = sys.argv[1]
else:
- config_file = "/etc/coremailer.ini"
+ config_file = "/etc/core_file_processor.ini"
logging.basicConfig(level=logging.INFO)
- config = ConfigParser.ConfigParser({
+ config_parser = ConfigParser.ConfigParser({
"region": "us-east-1",
"cores": "/cores",
"log": "/logs/host/syslog",
@@ -181,10 +184,8 @@ def run(self):
"mode": os.environ.get('MODE', 'aws')
})
+ config_parser.add_section("Config")
+ config_parser.read(config_file)
- config.add_section("Config")
- config.read(config_file)
-
- mailer = CoreMailer(config)
+ mailer = CoreMailer(config_parser)
mailer.run()
-
From c6e0000811e6ef2b783801dd9261bb48db547a35 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 12:07:33 +0900
Subject: [PATCH 0056/1507] Some docs about capturing core files
---
README.md | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/README.md b/README.md
index 6dfcc9fb..54f3875f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,33 @@
+## Core files
+
+Capturing core files from container process is a bit interesting. You'll need to first enable unlimited sized core dumps at the docker layer, then set a `core_pattern` to a location that the container has set up as a volume.
+
+If either are not set, the core will not be dumped.
+
+If you're on boot2docker you can set this by adding the following to the boot2docker profile:
+
+```sh
+echo '/cores/%e_%h_%s_%p_%t.core' > /proc/sys/kernel/core_pattern
+EXTRA_ARGS="--default-ulimit core=-1"
+```
+
+To edit this profile use the following commands to first edit the file, then restart the docker daemon:
+
+```console
+> boot2docker ssh -t sudo vi /var/lib/boot2docker/profile
+> boot2docker ssh 'sudo /etc/init.d/docker restart'
+```
+
+On docker-machine you can specify engine options when creating the machine, then use ssh to set the core pattern:
+
+```console
+> docker-machine create \
+ --driver virtualbox \
+ --engine-opt 'default-ulimit=core=-1' core1
+> docker-machine ssh core1 \
+ "sudo sh -c 'echo \"/cores/%e_%h_%s_%p_%t.core\" > /proc/sys/kernel/core_pattern'"
+```
+
## Full network
This one is still a little complex to get running, these are the basics:
From ce65c9660856d219799af580baf12666b2580e4e Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 12:11:18 +0900
Subject: [PATCH 0057/1507] Init using lovely_touching
This allows us to die on ABRT as expected and should avoid the possibility of zombie processes.
lovely_touching is pre-built as a binary using their own build scripts and stored on stellar.org's s3 along with a signed md5 checksum.
---
install | 5 +++++
start | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/install b/install
index 8ef60150..e71080b1 100755
--- a/install
+++ b/install
@@ -21,6 +21,11 @@ apt-get install -y postgresql-client
dpkg -i stellar-core.deb
rm stellar-core.deb
+# Allows SIGABRT and adopt orphaned child processes
+wget -nv -O init https://s3.amazonaws.com/stellar.org/releases/3rdparty/github.com/ohjames/lovely_touching/lovely_touching-559873ec
+test $(md5sum init | awk '{print $1}') == "429a9bcefd64e12ac0e0bc7ed91ea734"
+chmod +x init
+
# purge stuff we don't directly need
apt-get purge -y sgml-base ucf gcc g++ build-essential xz-utils libpod-latex-perl python-pip dbus
apt-get autoremove -y
diff --git a/start b/start
index 69a81277..32fd428a 100755
--- a/start
+++ b/start
@@ -46,4 +46,4 @@ while [[ -n "$1" ]]; do
esac
done
-exec stellar-core
+exec /init -- stellar-core
From 2dce11fe65ce826a05acc77b6550d339f11551b6 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 12:24:40 +0900
Subject: [PATCH 0058/1507] Actually, move the actually /init creation into
stellar base
---
install | 5 -----
1 file changed, 5 deletions(-)
diff --git a/install b/install
index e71080b1..8ef60150 100755
--- a/install
+++ b/install
@@ -21,11 +21,6 @@ apt-get install -y postgresql-client
dpkg -i stellar-core.deb
rm stellar-core.deb
-# Allows SIGABRT and adopt orphaned child processes
-wget -nv -O init https://s3.amazonaws.com/stellar.org/releases/3rdparty/github.com/ohjames/lovely_touching/lovely_touching-559873ec
-test $(md5sum init | awk '{print $1}') == "429a9bcefd64e12ac0e0bc7ed91ea734"
-chmod +x init
-
# purge stuff we don't directly need
apt-get purge -y sgml-base ucf gcc g++ build-essential xz-utils libpod-latex-perl python-pip dbus
apt-get autoremove -y
From 48c33f40da067d81c0196321ca563deafc8d79d8 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 16:21:10 +0900
Subject: [PATCH 0059/1507] A first cut at a fuzz build/run via containers
---
Dockerfile.fuzz | 18 ++++++++++++++++++
fuzz/install | 35 +++++++++++++++++++++++++++++++++++
fuzz/start | 10 ++++++++++
3 files changed, 63 insertions(+)
create mode 100644 Dockerfile.fuzz
create mode 100755 fuzz/install
create mode 100755 fuzz/start
diff --git a/Dockerfile.fuzz b/Dockerfile.fuzz
new file mode 100644
index 00000000..160411e9
--- /dev/null
+++ b/Dockerfile.fuzz
@@ -0,0 +1,18 @@
+FROM stellar/base:latest
+
+MAINTAINER Mat Schaffer
+
+ENV AFL_VERSION 1.83b
+
+RUN apt-get update
+
+ADD fuzz/install /
+RUN /install
+
+VOLUME /stellar-core
+
+ADD utils /utils
+ADD fuzz/trace /
+ADD fuzz/start /
+
+CMD ["/start"]
diff --git a/fuzz/install b/fuzz/install
new file mode 100755
index 00000000..fedb3565
--- /dev/null
+++ b/fuzz/install
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -e
+
+# apt-get update
+
+apt-get install -y \
+ make \
+ git \
+ gcc \
+ autoconf \
+ automake \
+ libtool \
+ pkg-config \
+ flex \
+ bison \
+ clang-3.5 \
+ llvm-3.5 \
+ g++-4.9 \
+ libstdc++6 \
+ libpq5 \
+ libpq-dev
+
+update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
+update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.5 90 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-3.5
+update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.5 90
+
+wget -nv -O afl-${AFL_VERSION}.tgz http://lcamtuf.coredump.cx/afl/releases/afl-${AFL_VERSION}.tgz
+tar -zxf afl-${AFL_VERSION}.tgz
+cd afl-${AFL_VERSION}
+make
+make install
+cd ..
+rm -rf afl-${AFL_VERSION}
+rm afl-${AFL_VERSION}.tgz
diff --git a/fuzz/start b/fuzz/start
new file mode 100755
index 00000000..f8241121
--- /dev/null
+++ b/fuzz/start
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+[[ -f stellar-core/autogen.sh ]] || git clone https://github.com/stellar/stellar-core stellar-core
+
+cd stellar-core
+./autogen.sh
+./configure --enable-afl
+make fuzz
From d331e108e1a2bcb05f930f70a23518a2eec360f1 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 16:21:37 +0900
Subject: [PATCH 0060/1507] Added stack trace deps to script so we can try to
sort out why XDR gen is segfaulting
---
fuzz/trace | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100755 fuzz/trace
diff --git a/fuzz/trace b/fuzz/trace
new file mode 100755
index 00000000..cc2ee07b
--- /dev/null
+++ b/fuzz/trace
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
+add-apt-repository "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main"
+apt-get update
+apt-get install -y libstdc++6 libpq5 lldb-3.6
From d9706d7c01d7609361c15d873fed89ca0972b23b Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 16:54:30 +0900
Subject: [PATCH 0061/1507] Seems that we need to make before make fuzz
---
fuzz/start | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fuzz/start b/fuzz/start
index f8241121..e2742aac 100755
--- a/fuzz/start
+++ b/fuzz/start
@@ -5,6 +5,8 @@ set -e
[[ -f stellar-core/autogen.sh ]] || git clone https://github.com/stellar/stellar-core stellar-core
cd stellar-core
+
./autogen.sh
./configure --enable-afl
+make
make fuzz
From 8c1184f5cadf1328e1f7646b5874a557c20a307f Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 17:58:35 +0900
Subject: [PATCH 0062/1507] A helper to pull all traces
---
fuzz/trace | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/fuzz/trace b/fuzz/trace
index cc2ee07b..829dca06 100755
--- a/fuzz/trace
+++ b/fuzz/trace
@@ -4,3 +4,14 @@ wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
add-apt-repository "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main"
apt-get update
apt-get install -y libstdc++6 libpq5 lldb-3.6
+
+BIN=/stellar-core/bin/stellar-core
+
+mkdir /cores/traces
+
+for CORE in /cores/*; do
+ lldb-3.6 -f $BIN $CORE --batch \
+ -o "target create -c '$CORE' '$BIN'" \
+ -o 'script import time; time.sleep(1)' \
+ -o 'thread backtrace all' 2>&1 > /cores/traces/$(basename $CORE).trace
+done
From 26bb4689ba0689d20c1a9300f063b99e708b8e6e Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 2 Jul 2015 22:01:27 +0900
Subject: [PATCH 0063/1507] use the python core processor for getting stack
traces
---
fuzz/install | 5 +++++
fuzz/trace | 17 +++++++++--------
utils/core_file_processor.py | 14 ++++++++------
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/fuzz/install b/fuzz/install
index fedb3565..cb734d8d 100755
--- a/fuzz/install
+++ b/fuzz/install
@@ -25,6 +25,11 @@ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 90 --slave /usr/
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.5 90 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-3.5
update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.5 90
+# for the core_file_processor
+apt-get install -y python-pip
+pip install boto
+
+# for the fuzzer
wget -nv -O afl-${AFL_VERSION}.tgz http://lcamtuf.coredump.cx/afl/releases/afl-${AFL_VERSION}.tgz
tar -zxf afl-${AFL_VERSION}.tgz
cd afl-${AFL_VERSION}
diff --git a/fuzz/trace b/fuzz/trace
index 829dca06..06b8b2e5 100755
--- a/fuzz/trace
+++ b/fuzz/trace
@@ -2,16 +2,17 @@
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
add-apt-repository "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main"
-apt-get update
-apt-get install -y libstdc++6 libpq5 lldb-3.6
+apt-get update -qq
+apt-get install -qq libstdc++6 libpq5 lldb-3.6
-BIN=/stellar-core/bin/stellar-core
+cat > /etc/core_file_processor.ini <&1 > /cores/traces/$(basename $CORE).trace
+for CORE in /cores/stellar-core*.core; do
+ /utils/core_file_processor.py $CORE > /cores/traces/$(basename $CORE).trace
done
diff --git a/utils/core_file_processor.py b/utils/core_file_processor.py
index e68a64ff..6f521e82 100755
--- a/utils/core_file_processor.py
+++ b/utils/core_file_processor.py
@@ -71,7 +71,7 @@ def get_trace(self, core):
"-o 'target create -c \"%(core)s\" \"%(binary)s\"' " + \
"-o 'script import time; time.sleep(1)' " + \
"-o 'thread backtrace all'"
- command = ["bash", "-c",
+ command = ["script", "-c",
(lldb_command % {"core": core, "binary": binary})]
return subprocess.check_output(command, stderr=subprocess.STDOUT)
@@ -140,8 +140,8 @@ def archive_core(self, core):
logging.warn("No archive command, just removing core file")
os.remove(core)
- def run(self):
- core = self.find_core()
+ def run(self, single_core):
+ core = single_core or self.find_core()
mode = self.config.get('Config', 'mode')
if core:
@@ -164,9 +164,11 @@ def run(self):
if __name__ == "__main__":
if len(sys.argv) > 1:
- config_file = sys.argv[1]
+ single_core = sys.argv[1]
else:
- config_file = "/etc/core_file_processor.ini"
+ single_core = None
+
+ config_file = "/etc/core_file_processor.ini"
logging.basicConfig(level=logging.INFO)
@@ -188,4 +190,4 @@ def run(self):
config_parser.read(config_file)
mailer = CoreMailer(config_parser)
- mailer.run()
+ mailer.run(single_core)
From 5901d66dd8ac458d9583f258e21a75ae2f4b1e40 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 2 Jul 2015 17:49:39 +0000
Subject: [PATCH 0064/1507] Bump Dockerfile to 0.0.1-30-5ea631f6
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 3c607c99..0ee7fd14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-29-6e0f6dd8
+ENV STELLAR_CORE_VERSION 0.0.1-30-5ea631f6
EXPOSE 39133
EXPOSE 39132
From e39bf8c21e446f72e0a3b20a86a30282b9ecf1f3 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 2 Jul 2015 21:09:29 +0000
Subject: [PATCH 0065/1507] Bump Dockerfile to 0.0.1-31-60715367
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 0ee7fd14..c7f8ee1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-30-5ea631f6
+ENV STELLAR_CORE_VERSION 0.0.1-31-60715367
EXPOSE 39133
EXPOSE 39132
From b142d7975ee993b66d4ad572309c6f3fa031d2f6 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 3 Jul 2015 01:42:01 +0000
Subject: [PATCH 0066/1507] Bump Dockerfile to 0.0.1-32-bbc452fa
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c7f8ee1a..3265ad33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-31-60715367
+ENV STELLAR_CORE_VERSION 0.0.1-32-bbc452fa
EXPOSE 39133
EXPOSE 39132
From 1b85dbf46cc5950b347457ef5d4f02a6244de8ee Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Fri, 3 Jul 2015 16:04:50 +0900
Subject: [PATCH 0067/1507] Move apt-get update inside the install layer
---
Dockerfile.fuzz | 2 --
fuzz/install | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Dockerfile.fuzz b/Dockerfile.fuzz
index 160411e9..9ca080b8 100644
--- a/Dockerfile.fuzz
+++ b/Dockerfile.fuzz
@@ -4,8 +4,6 @@ MAINTAINER Mat Schaffer
ENV AFL_VERSION 1.83b
-RUN apt-get update
-
ADD fuzz/install /
RUN /install
diff --git a/fuzz/install b/fuzz/install
index cb734d8d..c2db37d7 100755
--- a/fuzz/install
+++ b/fuzz/install
@@ -2,7 +2,7 @@
set -e
-# apt-get update
+apt-get update
apt-get install -y \
make \
From dc76aa9f01dc21bb2e761d31725d6858c5041776 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 3 Jul 2015 09:02:25 +0000
Subject: [PATCH 0068/1507] Bump Dockerfile to 0.0.1-36-bbc452fa
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 3265ad33..affec6f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-32-bbc452fa
+ENV STELLAR_CORE_VERSION 0.0.1-36-bbc452fa
EXPOSE 39133
EXPOSE 39132
From 63c37e9bfada8e02108f6f448a51474a85754b3c Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 7 Jul 2015 03:29:23 +0000
Subject: [PATCH 0069/1507] Bump Dockerfile to 0.0.1-37-3b46a956
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index affec6f0..a61890c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-36-bbc452fa
+ENV STELLAR_CORE_VERSION 0.0.1-37-3b46a956
EXPOSE 39133
EXPOSE 39132
From b073c01c9802371ec3d64532c4b4949ebc2bff54 Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Mon, 6 Jul 2015 21:08:56 -0700
Subject: [PATCH 0070/1507] Move fuzzable stellar-core build to install step.
---
fuzz/install | 7 +++++++
fuzz/start | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fuzz/install b/fuzz/install
index c2db37d7..830af0cf 100755
--- a/fuzz/install
+++ b/fuzz/install
@@ -38,3 +38,10 @@ make install
cd ..
rm -rf afl-${AFL_VERSION}
rm afl-${AFL_VERSION}.tgz
+
+# build stellar-core under fuzzer
+[[ -f stellar-core/autogen.sh ]] || git clone https://github.com/stellar/stellar-core stellar-core
+cd stellar-core
+./autogen.sh
+./configure --enable-afl
+make
diff --git a/fuzz/start b/fuzz/start
index e2742aac..8b66d2b9 100755
--- a/fuzz/start
+++ b/fuzz/start
@@ -2,11 +2,5 @@
set -e
-[[ -f stellar-core/autogen.sh ]] || git clone https://github.com/stellar/stellar-core stellar-core
-
cd stellar-core
-
-./autogen.sh
-./configure --enable-afl
-make
make fuzz
From c9c0f9b13f1412eeec96de7179fee43e02cd5724 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 7 Jul 2015 04:10:23 +0000
Subject: [PATCH 0071/1507] Bump Dockerfile to 0.0.1-38-b44560a5
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index a61890c6..6175571e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-37-3b46a956
+ENV STELLAR_CORE_VERSION 0.0.1-38-b44560a5
EXPOSE 39133
EXPOSE 39132
From 9ea5f4507c47663711e34785e6491b6e7563faf3 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Tue, 7 Jul 2015 14:30:41 +0900
Subject: [PATCH 0072/1507] Remove /stellar-core checking
Since we always build stellar-core on docker build we can't mount in any sort of source dir anyway.
---
Dockerfile.fuzz | 2 --
fuzz/install | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Dockerfile.fuzz b/Dockerfile.fuzz
index 9ca080b8..204a8dc2 100644
--- a/Dockerfile.fuzz
+++ b/Dockerfile.fuzz
@@ -7,8 +7,6 @@ ENV AFL_VERSION 1.83b
ADD fuzz/install /
RUN /install
-VOLUME /stellar-core
-
ADD utils /utils
ADD fuzz/trace /
ADD fuzz/start /
diff --git a/fuzz/install b/fuzz/install
index 830af0cf..3ee131d9 100755
--- a/fuzz/install
+++ b/fuzz/install
@@ -40,7 +40,7 @@ rm -rf afl-${AFL_VERSION}
rm afl-${AFL_VERSION}.tgz
# build stellar-core under fuzzer
-[[ -f stellar-core/autogen.sh ]] || git clone https://github.com/stellar/stellar-core stellar-core
+git clone https://github.com/stellar/stellar-core stellar-core
cd stellar-core
./autogen.sh
./configure --enable-afl
From e2c43d3516389cca7c424a546edf4eb099a05a9c Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Tue, 7 Jul 2015 14:34:14 +0900
Subject: [PATCH 0073/1507] Put the /stellar-core volume back in
Forgot we use it to run the corefile processor in a subsequent container
---
Dockerfile.fuzz | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Dockerfile.fuzz b/Dockerfile.fuzz
index 204a8dc2..8dc677ef 100644
--- a/Dockerfile.fuzz
+++ b/Dockerfile.fuzz
@@ -4,6 +4,8 @@ MAINTAINER Mat Schaffer
ENV AFL_VERSION 1.83b
+VOLUME /stellar-core
+
ADD fuzz/install /
RUN /install
From 5623ffd65ba1a3aaaefaf8332c9f937ebb0bedec Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Tue, 7 Jul 2015 15:12:19 +0900
Subject: [PATCH 0074/1507] Revert "Put the /stellar-core volume back in"
This reverts commit e2c43d3516389cca7c424a546edf4eb099a05a9c.
Processing the core traces actually uses the bin that's now in the image plus /cores which is already a volume from the base.
---
Dockerfile.fuzz | 2 --
1 file changed, 2 deletions(-)
diff --git a/Dockerfile.fuzz b/Dockerfile.fuzz
index 8dc677ef..204a8dc2 100644
--- a/Dockerfile.fuzz
+++ b/Dockerfile.fuzz
@@ -4,8 +4,6 @@ MAINTAINER Mat Schaffer
ENV AFL_VERSION 1.83b
-VOLUME /stellar-core
-
ADD fuzz/install /
RUN /install
From 9037c6155bf516d3a7c2c44ec3cf3543d4dace56 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 7 Jul 2015 06:53:29 +0000
Subject: [PATCH 0075/1507] Bump Dockerfile to 0.0.1-39-f6ff8332
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 6175571e..de774760 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-38-b44560a5
+ENV STELLAR_CORE_VERSION 0.0.1-39-f6ff8332
EXPOSE 39133
EXPOSE 39132
From d85d4c05bf1e9d80f686c09186de780d0a402872 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 8 Jul 2015 00:51:25 +0000
Subject: [PATCH 0076/1507] Bump Dockerfile to 0.0.1-40-b75d0b95
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index de774760..7512daa0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-39-f6ff8332
+ENV STELLAR_CORE_VERSION 0.0.1-40-b75d0b95
EXPOSE 39133
EXPOSE 39132
From 842a7ac194be3e3775c4fb595d7729ac2dbee73d Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Wed, 8 Jul 2015 10:53:05 +0900
Subject: [PATCH 0077/1507] Don't fail the /trace step if no core files were
produced
---
fuzz/trace | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/fuzz/trace b/fuzz/trace
index 06b8b2e5..5c5c7b3c 100755
--- a/fuzz/trace
+++ b/fuzz/trace
@@ -1,5 +1,14 @@
#!/usr/bin/env bash
+CORES=$(find /cores -maxdepth 1 -name 'stellar-core*.core')
+
+mkdir -p /cores/traces
+
+if [[ -z "${CORES}" ]]; then
+ echo No core files found
+ exit 0
+fi
+
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
add-apt-repository "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main"
apt-get update -qq
@@ -11,8 +20,6 @@ bin=/stellar-core/bin/stellar-core
mode=local
INI
-mkdir /cores/traces
-
for CORE in /cores/stellar-core*.core; do
/utils/core_file_processor.py $CORE > /cores/traces/$(basename $CORE).trace
done
From 5f8e99429a65ff9ae6af9eb4dd6ecb74fafb47c5 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 8 Jul 2015 01:53:26 +0000
Subject: [PATCH 0078/1507] Bump Dockerfile to 0.0.1-41-23621611
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7512daa0..e87ed051 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-40-b75d0b95
+ENV STELLAR_CORE_VERSION 0.0.1-41-23621611
EXPOSE 39133
EXPOSE 39132
From 9c73dab53da0e4468c48d71117498327aba23abd Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 8 Jul 2015 03:40:08 +0000
Subject: [PATCH 0079/1507] Bump Dockerfile to 0.0.1-42-83e73503
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e87ed051..e1c4114e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-41-23621611
+ENV STELLAR_CORE_VERSION 0.0.1-42-83e73503
EXPOSE 39133
EXPOSE 39132
From c487fbbd0d90bd992e7780e03fb3a93c2eda511f Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 7 Jul 2015 22:10:42 -0700
Subject: [PATCH 0080/1507] Build afl-clang-fast in fuzz/install
---
fuzz/install | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fuzz/install b/fuzz/install
index 3ee131d9..cef224b2 100755
--- a/fuzz/install
+++ b/fuzz/install
@@ -24,6 +24,7 @@ apt-get install -y \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.5 90 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-3.5
update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-3.5 90
+update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-3.5 90
# for the core_file_processor
apt-get install -y python-pip
@@ -34,6 +35,7 @@ wget -nv -O afl-${AFL_VERSION}.tgz http://lcamtuf.coredump.cx/afl/releases/afl-$
tar -zxf afl-${AFL_VERSION}.tgz
cd afl-${AFL_VERSION}
make
+make -C llvm_mode
make install
cd ..
rm -rf afl-${AFL_VERSION}
From 7f5a1b22a9c23690b280ac254a40971f7af16ca9 Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 7 Jul 2015 22:11:18 -0700
Subject: [PATCH 0081/1507] Do make -k $(nproc) in fuzz/install
---
fuzz/install | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fuzz/install b/fuzz/install
index cef224b2..eb325cf6 100755
--- a/fuzz/install
+++ b/fuzz/install
@@ -46,4 +46,4 @@ git clone https://github.com/stellar/stellar-core stellar-core
cd stellar-core
./autogen.sh
./configure --enable-afl
-make
+make -j $(nproc)
From 2ca88f5635e2ff470df7e5f582181bb7554cae4e Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 7 Jul 2015 22:11:45 -0700
Subject: [PATCH 0082/1507] Set AFL_PERSISTENT=1 in fuzz/start
---
fuzz/start | 1 +
1 file changed, 1 insertion(+)
diff --git a/fuzz/start b/fuzz/start
index 8b66d2b9..f45e5315 100755
--- a/fuzz/start
+++ b/fuzz/start
@@ -3,4 +3,5 @@
set -e
cd stellar-core
+export AFL_PERSISTENT=1
make fuzz
From 1df14137d2c9abeaa746e81ea9bae5c77796b051 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 8 Jul 2015 05:49:06 +0000
Subject: [PATCH 0083/1507] Bump Dockerfile to 0.0.1-43-1424af8d
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e1c4114e..9cfdc019 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-42-83e73503
+ENV STELLAR_CORE_VERSION 0.0.1-43-1424af8d
EXPOSE 39133
EXPOSE 39132
From e57e810039a759e0f485b74ec34b9a45d51bee14 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 9 Jul 2015 19:05:18 +0000
Subject: [PATCH 0084/1507] Bump Dockerfile to 0.0.1-44-8ff1e433
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9cfdc019..2e60f14d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-43-1424af8d
+ENV STELLAR_CORE_VERSION 0.0.1-44-8ff1e433
EXPOSE 39133
EXPOSE 39132
From f85b07eb4446ed2ae37a230ef68957fc416526fb Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 9 Jul 2015 19:44:01 +0000
Subject: [PATCH 0085/1507] Bump Dockerfile to 0.0.1-45-cedf2f9b
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 2e60f14d..7054c666 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-44-8ff1e433
+ENV STELLAR_CORE_VERSION 0.0.1-45-cedf2f9b
EXPOSE 39133
EXPOSE 39132
From 7e4cc546cab8c7620871cec3488094718fb2afd6 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 9 Jul 2015 23:19:30 +0000
Subject: [PATCH 0086/1507] Bump Dockerfile to 0.0.1-46-5c7970bc
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7054c666..d2548df3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-45-cedf2f9b
+ENV STELLAR_CORE_VERSION 0.0.1-46-5c7970bc
EXPOSE 39133
EXPOSE 39132
From 6197fd3f2ce562b9ed76a1105cf4ddb20b82f925 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 10 Jul 2015 00:36:48 +0000
Subject: [PATCH 0087/1507] Bump Dockerfile to 0.0.1-47-ab2b0e14
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d2548df3..a231cd80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-46-5c7970bc
+ENV STELLAR_CORE_VERSION 0.0.1-47-ab2b0e14
EXPOSE 39133
EXPOSE 39132
From ba2468cbfabfe28fc2c55a3ce9d813518c8279b3 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 10 Jul 2015 05:30:35 +0000
Subject: [PATCH 0088/1507] Bump Dockerfile to 0.0.1-48-8ec93e6c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index a231cd80..d4f4501f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-47-ab2b0e14
+ENV STELLAR_CORE_VERSION 0.0.1-48-8ec93e6c
EXPOSE 39133
EXPOSE 39132
From d948ebecd2338c73711bcf0e69695eee5aae06e8 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 10 Jul 2015 15:41:17 +0000
Subject: [PATCH 0089/1507] Bump Dockerfile to 0.0.1-49-e81ed913
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d4f4501f..d944203c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-48-8ec93e6c
+ENV STELLAR_CORE_VERSION 0.0.1-49-e81ed913
EXPOSE 39133
EXPOSE 39132
From 9ebb5d4fe0c2b9fb695d126ba534c1f7ad103ea3 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 10 Jul 2015 17:05:12 +0000
Subject: [PATCH 0090/1507] Bump Dockerfile to 0.0.1-50-762d4300
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d944203c..ec06e77c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-49-e81ed913
+ENV STELLAR_CORE_VERSION 0.0.1-50-762d4300
EXPOSE 39133
EXPOSE 39132
From 0476133f931c3770875e7e35086e4aeeacc0928e Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 10 Jul 2015 23:15:36 +0000
Subject: [PATCH 0091/1507] Bump Dockerfile to 0.0.1-51-77fa464f
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ec06e77c..bc4925a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-50-762d4300
+ENV STELLAR_CORE_VERSION 0.0.1-51-77fa464f
EXPOSE 39133
EXPOSE 39132
From 5d91d9843e153401759c5217bb76c31e54528fa9 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 11 Jul 2015 02:41:03 +0000
Subject: [PATCH 0092/1507] Bump Dockerfile to 0.0.1-52-6a912511
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index bc4925a8..c4d1dcdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-51-77fa464f
+ENV STELLAR_CORE_VERSION 0.0.1-52-6a912511
EXPOSE 39133
EXPOSE 39132
From 25ebd6008a19cf2b05baf00bd27d353a4b619e22 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 11 Jul 2015 04:35:05 +0000
Subject: [PATCH 0093/1507] Bump Dockerfile to 0.0.1-53-1edcacc5
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c4d1dcdd..972fc95e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-52-6a912511
+ENV STELLAR_CORE_VERSION 0.0.1-53-1edcacc5
EXPOSE 39133
EXPOSE 39132
From cdd2b7f7d0aa66208337cd040f86bef94d802aaf Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Mon, 6 Jul 2015 15:42:16 +0900
Subject: [PATCH 0094/1507] Add a skipstart so we can prime the initial prod
containers
This allows us to get the db ready & set the force scp flag without actually starting the final container. This allows us to have the final prod container get started by a daemon manager.
---
start | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/start b/start
index 32fd428a..61d234c6 100755
--- a/start
+++ b/start
@@ -40,10 +40,17 @@ while [[ -n "$1" ]]; do
forcescp)
stellar-core --forcescp
;;
+ skipstart)
+ SKIP_START=true
+ ;;
*)
echo "Unknown container command $COMMAND" >&2
exit 1
esac
done
-exec /init -- stellar-core
+if [[ -z "${SKIP_START}" ]]; then
+ exec /init -- stellar-core
+else
+ echo "Setup complete. Skipping server start."
+fi
From 716c991a179b1d65943bc54ea4853241deaa6555 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Tue, 7 Jul 2015 14:19:33 +0900
Subject: [PATCH 0095/1507] Add a HORIZON_PASSWORD and auto configure the
horizon account during the "fresh" step
---
examples/local.env | 1 +
examples/single.env | 1 +
start | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+)
diff --git a/examples/local.env b/examples/local.env
index 5b64b92c..7ae2bd40 100644
--- a/examples/local.env
+++ b/examples/local.env
@@ -1,4 +1,5 @@
POSTGRES_PASSWORD=mysecretpassword
+HORIZON_PASSWORD=myreadonlyhorizonpassword
node1_POSTGRES_PORT=5441
node1_PEER_PORT=39141
diff --git a/examples/single.env b/examples/single.env
index 426deb84..bae2054f 100644
--- a/examples/single.env
+++ b/examples/single.env
@@ -1,4 +1,5 @@
POSTGRES_PASSWORD=postgrespassword
+HORIZON_PASSWORD=myreadonlyhorizonpassword
ENVIRONMENT=dev
CLUSTER_NAME=docker-single
diff --git a/start b/start
index 61d234c6..5d728423 100755
--- a/start
+++ b/start
@@ -32,6 +32,26 @@ while [[ -n "$1" ]]; do
dropdb stellar || true
createdb stellar
+
+ if [[ -n "${HORIZON_PASSWORD}" ]]; then
+ dropuser horizon || true
+ createuser horizon
+ psql -c "alter user horizon with password '${HORIZON_PASSWORD}'"
+ psql >/dev/null <<-SQL
+ GRANT CONNECT ON DATABASE stellar to horizon;
+ \c stellar
+ REVOKE ALL ON schema public FROM public;
+ GRANT ALL ON schema public TO stellar;
+ GRANT USAGE ON SCHEMA public to horizon;
+
+ GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO horizon;
+ GRANT SELECT ON ALL TABLES IN SCHEMA public TO horizon;
+
+ ALTER DEFAULT PRIVILEGES FOR USER stellar IN SCHEMA public GRANT SELECT ON SEQUENCES TO horizon;
+ ALTER DEFAULT PRIVILEGES FOR USER stellar IN SCHEMA public GRANT SELECT ON TABLES TO horizon;
+SQL
+ fi
+
stellar-core --newdb
[[ -n "${HISTORY_RESET}" ]] && $(printf "${HISTORY_RESET}" "${SELF}") || true
From f01dcb25ca74ca12ccba9c731d9b240a8e79af80 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Mon, 13 Jul 2015 10:18:12 +0900
Subject: [PATCH 0096/1507] Don't put hosts syslog in /logs since that volume
will likely already be mounted to the host fs
---
confd/templates/hekad.toml.tmpl | 2 +-
utils/core_file_processor.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/confd/templates/hekad.toml.tmpl b/confd/templates/hekad.toml.tmpl
index a8e1f4cd..43076885 100644
--- a/confd/templates/hekad.toml.tmpl
+++ b/confd/templates/hekad.toml.tmpl
@@ -55,7 +55,7 @@ stderr = true
{{if (getenv "AWS_CREDENTIAL_SOURCE")}}
"-v", "{{getenv "AWS_CREDENTIAL_SOURCE"}}:/root/.aws:ro",
{{end}}
- "-v", "/var/log/syslog:/logs/host/syslog:ro",
+ "-v", "/var/log/syslog:/host/syslog:ro",
"--volumes-from", "{{getenv "CONTAINER_ID"}}",
{{if (getenv "USE_SYSLOG")}}
"--log-driver", "syslog",
diff --git a/utils/core_file_processor.py b/utils/core_file_processor.py
index 6f521e82..130f4746 100755
--- a/utils/core_file_processor.py
+++ b/utils/core_file_processor.py
@@ -175,7 +175,7 @@ def run(self, single_core):
config_parser = ConfigParser.ConfigParser({
"region": "us-east-1",
"cores": "/cores",
- "log": "/logs/host/syslog",
+ "log": "/host/syslog",
"log_filter": os.environ.get('CORE_LOG_FILTER'),
"core_filter": "stellar-core",
"hostname": socket.gethostname(),
From 57d03814d4c0eafd5ed5b5c4ec8552b3ac95fe7c Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 14 Jul 2015 00:50:11 +0000
Subject: [PATCH 0097/1507] Bump Dockerfile to 0.0.1-54-aea3082a
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 972fc95e..e5fcb366 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-53-1edcacc5
+ENV STELLAR_CORE_VERSION 0.0.1-54-aea3082a
EXPOSE 39133
EXPOSE 39132
From e4e64bfd57ed3c716a6c0e9a7b6934ae09b37ac9 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Wed, 15 Jul 2015 13:25:55 +0900
Subject: [PATCH 0098/1507] Fix default postgres permissions for horizon user
---
start | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/start b/start
index 5d728423..9636c52c 100755
--- a/start
+++ b/start
@@ -41,14 +41,14 @@ while [[ -n "$1" ]]; do
GRANT CONNECT ON DATABASE stellar to horizon;
\c stellar
REVOKE ALL ON schema public FROM public;
- GRANT ALL ON schema public TO stellar;
+ GRANT ALL ON schema public TO postgres;
GRANT USAGE ON SCHEMA public to horizon;
GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO horizon;
GRANT SELECT ON ALL TABLES IN SCHEMA public TO horizon;
- ALTER DEFAULT PRIVILEGES FOR USER stellar IN SCHEMA public GRANT SELECT ON SEQUENCES TO horizon;
- ALTER DEFAULT PRIVILEGES FOR USER stellar IN SCHEMA public GRANT SELECT ON TABLES TO horizon;
+ ALTER DEFAULT PRIVILEGES FOR USER postgres IN SCHEMA public GRANT SELECT ON SEQUENCES TO horizon;
+ ALTER DEFAULT PRIVILEGES FOR USER postgres IN SCHEMA public GRANT SELECT ON TABLES TO horizon;
SQL
fi
From 4105a23ae1f1c0bc271fcf8f2e2895b650e4bf00 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 15 Jul 2015 05:29:10 +0000
Subject: [PATCH 0099/1507] Bump Dockerfile to 0.0.1-55-81db7e3c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e5fcb366..77214a5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-54-aea3082a
+ENV STELLAR_CORE_VERSION 0.0.1-55-81db7e3c
EXPOSE 39133
EXPOSE 39132
From cb4350407c5cadbb9d6ee640a52e581a18a7b633 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 15 Jul 2015 16:46:34 +0000
Subject: [PATCH 0100/1507] Bump Dockerfile to 0.0.1-56-9805a57c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 77214a5a..b84205a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-55-81db7e3c
+ENV STELLAR_CORE_VERSION 0.0.1-56-9805a57c
EXPOSE 39133
EXPOSE 39132
From 67bc4f20c1e23cfde356d1b044cbc3c95809c007 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 15 Jul 2015 22:19:08 +0000
Subject: [PATCH 0101/1507] Bump Dockerfile to 0.0.1-57-bc6c9052
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index b84205a5..dcc799cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-56-9805a57c
+ENV STELLAR_CORE_VERSION 0.0.1-57-bc6c9052
EXPOSE 39133
EXPOSE 39132
From a188bc497fdb3fa6605f4b10a2256c0fd6a8a8d9 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 16 Jul 2015 09:09:49 +0000
Subject: [PATCH 0102/1507] Bump Dockerfile to 0.0.1-58-8d76947a
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index dcc799cd..7c4b33e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-57-bc6c9052
+ENV STELLAR_CORE_VERSION 0.0.1-58-8d76947a
EXPOSE 39133
EXPOSE 39132
From 835ba92a96184e1052d4290c905a07e8a0613b65 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 16 Jul 2015 09:54:34 +0000
Subject: [PATCH 0103/1507] Bump Dockerfile to 0.0.1-59-86c57b74
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7c4b33e0..6ade3447 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-58-8d76947a
+ENV STELLAR_CORE_VERSION 0.0.1-59-86c57b74
EXPOSE 39133
EXPOSE 39132
From 9f9bd80a8bc45d049835db09f458dbf3aa1bc21a Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 16 Jul 2015 17:55:03 +0000
Subject: [PATCH 0104/1507] Bump Dockerfile to 0.0.1-60-6286759e
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 6ade3447..cbcd91b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-59-86c57b74
+ENV STELLAR_CORE_VERSION 0.0.1-60-6286759e
EXPOSE 39133
EXPOSE 39132
From 0b4c9127d2e4d1365b65bceed989e65f4687e829 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 16 Jul 2015 20:09:41 +0000
Subject: [PATCH 0105/1507] Bump Dockerfile to 0.0.1-61-83bd4396
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index cbcd91b9..ad03da60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-60-6286759e
+ENV STELLAR_CORE_VERSION 0.0.1-61-83bd4396
EXPOSE 39133
EXPOSE 39132
From d27d6fe0d5eca94cfd4e296aa715fe0e61e1515c Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 16 Jul 2015 21:09:28 +0000
Subject: [PATCH 0106/1507] Bump Dockerfile to 0.0.1-62-5f94fa02
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ad03da60..4e8659a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-61-83bd4396
+ENV STELLAR_CORE_VERSION 0.0.1-62-5f94fa02
EXPOSE 39133
EXPOSE 39132
From 557b5b52c2f3cd0e5b2cc5d69fc0f8dc53cf20f2 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 16 Jul 2015 23:54:39 +0000
Subject: [PATCH 0107/1507] Bump Dockerfile to 0.0.1-63-a896c0f7
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 4e8659a9..f5059153 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-62-5f94fa02
+ENV STELLAR_CORE_VERSION 0.0.1-63-a896c0f7
EXPOSE 39133
EXPOSE 39132
From aae7b7475c591115911b0a08058181fa6937cc3c Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 01:44:41 +0000
Subject: [PATCH 0108/1507] Bump Dockerfile to 0.0.1-64-479543fe
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index f5059153..4945ed6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-63-a896c0f7
+ENV STELLAR_CORE_VERSION 0.0.1-64-479543fe
EXPOSE 39133
EXPOSE 39132
From 8c63ee5b6f66d742ef367c9704f7af72bc7b39ae Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 06:29:58 +0000
Subject: [PATCH 0109/1507] Bump Dockerfile to 0.0.1-65-64fabfb3
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 4945ed6b..070dedfa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-64-479543fe
+ENV STELLAR_CORE_VERSION 0.0.1-65-64fabfb3
EXPOSE 39133
EXPOSE 39132
From c997e4a091759fa30ff83b7473b9fb47b42b354b Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 14:49:28 +0000
Subject: [PATCH 0110/1507] Bump Dockerfile to 0.0.1-66-7ce3dde7
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 070dedfa..cca65483 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-65-64fabfb3
+ENV STELLAR_CORE_VERSION 0.0.1-66-7ce3dde7
EXPOSE 39133
EXPOSE 39132
From 135dfb03d90c8140b17d4f07fc6b4f8468c0ff5d Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 16:09:23 +0000
Subject: [PATCH 0111/1507] Bump Dockerfile to 0.0.1-67-06baf9ee
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index cca65483..9b3cdd8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-66-7ce3dde7
+ENV STELLAR_CORE_VERSION 0.0.1-67-06baf9ee
EXPOSE 39133
EXPOSE 39132
From 3e3367c3e00d9d0e43c30c14b2c7027bd1e3ae60 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 16:45:07 +0000
Subject: [PATCH 0112/1507] Bump Dockerfile to 0.0.1-68-7915fcdc
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9b3cdd8c..fc79879c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-67-06baf9ee
+ENV STELLAR_CORE_VERSION 0.0.1-68-7915fcdc
EXPOSE 39133
EXPOSE 39132
From a6e5b1a8321d0c0a10c0d60bce8315779ac678d2 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 17:00:56 +0000
Subject: [PATCH 0113/1507] Bump Dockerfile to 0.0.1-69-31d99242
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index fc79879c..79362b0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-68-7915fcdc
+ENV STELLAR_CORE_VERSION 0.0.1-69-31d99242
EXPOSE 39133
EXPOSE 39132
From 8fe66d5b3c149edc14da5d3382846470b1a0bac8 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 17:19:33 +0000
Subject: [PATCH 0114/1507] Bump Dockerfile to 0.0.1-70-c2891802
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 79362b0f..58e9e079 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-69-31d99242
+ENV STELLAR_CORE_VERSION 0.0.1-70-c2891802
EXPOSE 39133
EXPOSE 39132
From 699021c42cc373ceedc5df6d9ff72d677d305839 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 17 Jul 2015 19:30:11 +0000
Subject: [PATCH 0115/1507] Bump Dockerfile to 0.0.1-71-6adb3b34
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 58e9e079..f176f201 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-70-c2891802
+ENV STELLAR_CORE_VERSION 0.0.1-71-6adb3b34
EXPOSE 39133
EXPOSE 39132
From cbc8d8dff91302499aaf5510878d6c6a8c816f8b Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 18 Jul 2015 02:25:45 +0000
Subject: [PATCH 0116/1507] Bump Dockerfile to 0.0.1-72-255fa8de
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index f176f201..b88bd263 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-71-6adb3b34
+ENV STELLAR_CORE_VERSION 0.0.1-72-255fa8de
EXPOSE 39133
EXPOSE 39132
From 2260009c1f2fe79db1e332739793bf5d3f3c12b1 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Mon, 20 Jul 2015 21:59:57 +0000
Subject: [PATCH 0117/1507] Bump Dockerfile to 0.0.1-73-1b6487c3
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index b88bd263..94426157 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-72-255fa8de
+ENV STELLAR_CORE_VERSION 0.0.1-73-1b6487c3
EXPOSE 39133
EXPOSE 39132
From d55eb8e492fea3615c0f03738aea863871185191 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 21 Jul 2015 18:39:47 +0000
Subject: [PATCH 0118/1507] Bump Dockerfile to 0.0.1-74-3757063f
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 94426157..845ecf5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-73-1b6487c3
+ENV STELLAR_CORE_VERSION 0.0.1-74-3757063f
EXPOSE 39133
EXPOSE 39132
From 433d510a08026d43766fe0a1c92b3d8b4965a0d2 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Wed, 22 Jul 2015 06:37:04 +0900
Subject: [PATCH 0119/1507] Update to new key format where we can
---
examples/local.env | 14 +++++++-------
examples/single.env | 11 ++++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/examples/local.env b/examples/local.env
index 7ae2bd40..acea2c56 100644
--- a/examples/local.env
+++ b/examples/local.env
@@ -4,26 +4,26 @@ HORIZON_PASSWORD=myreadonlyhorizonpassword
node1_POSTGRES_PORT=5441
node1_PEER_PORT=39141
node1_HTTP_PORT=39151
-node1_PEER_SEED=sfmnfPN6avam5Uvhcon8M6TTsf4AuKMkcMsS3BVjWgF6gfQ5aeC
-node1_VALIDATION_SEED=s3uimLdu4rwLvmPGxaUQTZDSjVnt4SHxmShkCQJvRDnN1Cjmo3s
+node1_PEER_SEED=SCKYW6CVNBJPT6T3BPG3NXRXGCHPSIAVWNUJ35YNGXW2QIAWYJW2YEOP
+node1_VALIDATION_SEED=SAJEJWKJAOELT2TJPTNLZXXSC3QXHKXDZD6NZLM3B6VQ7G22DQH5TC6C
node2_POSTGRES_PORT=5442
node2_PEER_PORT=39142
node2_HTTP_PORT=39152
-node2_PEER_SEED=s3PnDq5KkE4YyL7PfgvruXdtgEfj3FXRGEBJpA8KqsgQiEsUGs4
-node2_VALIDATION_SEED=s3TpDvrUEA9SVJVhswWPibcxYFcQcUJhRWBGg8nq8ZqkDc5UE2K
+node2_PEER_SEED=SBTEQJMDYCNRXRBEUUK7PTC737GVE24VSFVEHQXRALAARQCU5O246KVT
+node2_VALIDATION_SEED=SACTBO4KQ3LYYRRKBST3ZCO24FYRDP2CYN3W5IPP2OTC3NUIKFGZSRRY
node3_POSTGRES_PORT=5443
node3_PEER_PORT=39143
node3_HTTP_PORT=39153
-node3_PEER_SEED=s3gPU7Z8ryCKbrjffZpwyu3tE7MrFrvU7AgAGJVsGfCnQcNeyW7
-node3_VALIDATION_SEED=s3ARJMATEstWK58sxAbmvmkgrNgZzFM66C58ULsEthZ1FryMVSx
+node3_PEER_SEED=SDU3BWZYYR2F6PBDUMXCN52JW4PQYID57LXZ47BNWDHUQ2SETZ4IIWPR
+node3_VALIDATION_SEED=SCVXYFYE6BQYZD4O6J5ULJXRZYXLMKMXZEI3O3HGTQEB43UOY4XUZV3L
PREFERRED_PEERS=["127.0.0.1:39141", "127.0.0.1:39142", "127.0.0.1:39143"]
QUORUM_THRESHOLD=2
-QUORUM_SET=["gsqoWcxJUDxgGqENvGoNz3CVmVnfURiYKjsPogfWqabeqDCi9Mp", "gsFwwTSXftTM24KVozzZ7VEdcgvEDJkwcE73XY83T3vow7b39py", "gXPu1YBeS5UszrhYQhda3JUBbA7j3LQnJg3YsmraBMGSukcASf"]
+QUORUM_SET=["GBB2FMDSJY2VMKKB4QRAXU32OEYV5WPW4CRXB3NQSSD4YENKRMGAC7NB", "GB4FD5MNQ73WYA47YM2PP443ZE2KUBUI2I36LZAECGZ37ABLUN257GSI", "GACI4DOR3ILATD6CAPNDAAWVFNCOB3YRQ7BXJ3R7D5K7ICEZOYS26QUN"]
HISTORY_GET=aws s3 cp --region eu-west-1 s3://history-stg.stellar.org/dev/core-docker/%s/{0} {1}
HISTORY_PUT=aws s3 cp --region eu-west-1 {0} s3://history-stg.stellar.org/dev/core-docker/%s/{1}
diff --git a/examples/single.env b/examples/single.env
index bae2054f..7eccd062 100644
--- a/examples/single.env
+++ b/examples/single.env
@@ -4,8 +4,6 @@ HORIZON_PASSWORD=myreadonlyhorizonpassword
ENVIRONMENT=dev
CLUSTER_NAME=docker-single
-ATLAS_ADDRESS=http://localhost:7101/api/v1/publish
-
# CORE_ALERT_RECIPIENT=mat@stellar.org
# CORE_ARCHIVE_COMMAND=aws s3 --region eu-west-1 cp {0} s3://stellar-ops/cores/dev/{1}
# AWS_CREDENTIAL_SOURCE=/path/to/your/.aws
@@ -14,16 +12,19 @@ ATLAS_ADDRESS=http://localhost:7101/api/v1/publish
# INFLUX_USERNAME=root
# INFLUX_PASSWORD=root
+# ATLAS_ADDRESS=http://localhost:7101/api/v1/publish
+
main_POSTGRES_PORT=5432
main_PEER_PORT=39133
main_HTTP_PORT=39132
-main_PEER_SEED=sfFo2mAWyKowPHRXM7bb67EQARxqMyvg3vPW5y3H99G3ZgsqDme
-main_VALIDATION_SEED=s9gGoLApmkAKoXrGUkgdmDXneYCvgpZ4jJrZKbwr6KJ12S1Y5gB
+
+main_PEER_SEED=SAPTDXRE7AYZKZB2GRDHEI277Q2HQ5MO32XM3GWMGHK3FSIM5EXMYM62
+main_VALIDATION_SEED=SACJC372QBSSKJYTV5A7LWT4NXWHTQO6GHG4QDAVC2XDPX6CNNXFZ4JK
QUORUM_THRESHOLD=1
PREFERRED_PEERS=["127.0.0.1:39133"]
-QUORUM_SET=["gsZT1DcYtAC6aVi1uiunnD5vJbZK25Qpa5HyyVBamjcXBLRJJAf"]
+QUORUM_SET=["GD5KD2KEZJIGTC63IGW6UMUSMVUVG5IHG64HUTFWCHVZH2N2IBOQN7PS"]
HISTORY_PEERS=["main"]
From fd6b727dbbee7d576de6890d66499151f3de1e76 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Wed, 22 Jul 2015 06:46:16 +0900
Subject: [PATCH 0120/1507] Revamp docs a bit for current state of things
---
README.md | 98 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 57 insertions(+), 41 deletions(-)
diff --git a/README.md b/README.md
index 54f3875f..76b5a3c1 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,15 @@
-## Core files
+# stellar-core
-Capturing core files from container process is a bit interesting. You'll need to first enable unlimited sized core dumps at the docker layer, then set a `core_pattern` to a location that the container has set up as a volume.
+Docker definitions for [stellar-core](https://github.com/stellar/stellar-core)
-If either are not set, the core will not be dumped.
+# Usage
-If you're on boot2docker you can set this by adding the following to the boot2docker profile:
-```sh
-echo '/cores/%e_%h_%s_%p_%t.core' > /proc/sys/kernel/core_pattern
-EXTRA_ARGS="--default-ulimit core=-1"
-```
+## A local full network
-To edit this profile use the following commands to first edit the file, then restart the docker daemon:
+This starts a 3 node local stellar-core network, all on the same docker host.
-```console
-> boot2docker ssh -t sudo vi /var/lib/boot2docker/profile
-> boot2docker ssh 'sudo /etc/init.d/docker restart'
-```
-
-On docker-machine you can specify engine options when creating the machine, then use ssh to set the core pattern:
-
-```console
-> docker-machine create \
- --driver virtualbox \
- --engine-opt 'default-ulimit=core=-1' core1
-> docker-machine ssh core1 \
- "sudo sh -c 'echo \"/cores/%e_%h_%s_%p_%t.core\" > /proc/sys/kernel/core_pattern'"
-```
-
-## Full network
-
-This one is still a little complex to get running, these are the basics:
-
-* make an env file for the cluster similar to `examples/local.env`
-
-* start the cluster
+Note that the provided local.env uses SDF S3 locations, so edit it to match the specifics of your environment.
```sh
for N in 1 2; do
@@ -48,36 +23,43 @@ for N in 3; do
done
```
-* check cluster status
+The use of `-v ~/.aws:/root/.aws` here mounts your local aws credentials into the container which allows the network to use S3 for storage.
+
+You can check the cluster status with curl. The IP shown here is a typical boot2docker IP. Replace it with the IP of your docker host.
```sh
watch 'echo 1 2 3 | xargs -n1 -I{} curl -s 192.168.59.103:3915{}/info'
```
-* Clean up the cluster
+Basic clean up involves simply wiping out all containers. S3 history must be removed seperately. Something like this should do the trick.
```sh
-# Clean up all containers
docker ps -a | egrep '(node|db)\d+' | awk '{ print $1 }' | xargs -n1 docker rm -f -v
```
-## Single peer tests
+## Single node configurations
-Catch up complete
+> **NOTE:** The commands below are pinned to version 0.0.1-62-5f94fa02 to match testnet.
+>
+> This is to avoid key format issues following the merge of https://github.com/stellar/stellar-core/pull/619. This tag should be removed once testnet is updated.
+
+### Catch up complete with SDF testnet
```
docker run --name db_compat_complete -p 5541:5432 --env-file examples/compat_complete.env -d stellar/stellar-core-state
-docker run --name compat_complete --net host --volumes-from db_compat_complete --env-file examples/compat_complete.env -d stellar/stellar-core /start compat_complete fresh
+docker run --name compat_complete --net host --volumes-from db_compat_complete --env-file examples/compat_complete.env -d stellar/stellar-core:0.0.1-62-5f94fa02 /start compat_complete fresh
```
-Catch up minimal
+### Catch up minimal with SDF testnet
```
docker run --name db_compat_minimal -p 5641:5432 --env-file examples/compat_minimal.env -d stellar/stellar-core-state
-docker run --name compat_minimal --net host --volumes-from db_compat_minimal --env-file examples/compat_minimal.env -d stellar/stellar-core /start compat_minimal fresh
+docker run --name compat_minimal --net host --volumes-from db_compat_minimal --env-file examples/compat_minimal.env -d stellar/stellar-core:0.0.1-62-5f94fa02 /start compat_minimal fresh
```
-Single node local network (with monitoring). Note that the monitoring container is invoked with the docker socket exposed. This allows us to invoke `docker run stellar/stellar-core` to do things like process core dumps.
+### Single node local network (with monitoring)
+
+Note that the monitoring container is invoked with the docker socket exposed. This allows the monitoring container to invoke `docker run stellar/stellar-core` to do things like process core dumps.
```
docker run --name single-state \
@@ -91,8 +73,9 @@ docker run --name single \
-v /volumes/main/cores:/cores -v /volumes/main/logs:/logs \
--env-file examples/single.env \
-d stellar/stellar-core \
- /start main fresh
+ /start main fresh forcescp
+# optionally
docker run --name single-heka \
--net container:single \
--volumes-from single \
@@ -100,3 +83,36 @@ docker run --name single-heka \
--env-file examples/single.env \
-d stellar/heka
```
+
+## A note on capturing core files
+
+Capturing core files from container process is a bit involved.
+
+You'll need to first enable unlimited sized core dumps at the docker layer, then set a `core_pattern` to a location that the container has set up as a volume.
+
+If either are not set, the core will not be dumped.
+
+If you're on boot2docker you can set this by adding the following to the boot2docker profile:
+
+```sh
+echo '/cores/%e_%h_%s_%p_%t.core' > /proc/sys/kernel/core_pattern
+EXTRA_ARGS="--default-ulimit core=-1"
+```
+
+To edit this profile use the following commands to first edit the file, then restart the docker daemon:
+
+```console
+> boot2docker ssh -t sudo vi /var/lib/boot2docker/profile
+> boot2docker ssh 'sudo /etc/init.d/docker restart'
+```
+
+On docker-machine you can specify engine options when creating the machine, then use ssh to set the core pattern:
+
+```console
+> docker-machine create \
+ --driver virtualbox \
+ --engine-opt 'default-ulimit=core=-1' core1
+> docker-machine ssh core1 \
+ "sudo sh -c 'echo \"/cores/%e_%h_%s_%p_%t.core\" > /proc/sys/kernel/core_pattern'"
+```
+
From c067ebb27b686cc7810aa1b4e3aae25548912e84 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 22 Jul 2015 00:53:12 +0000
Subject: [PATCH 0121/1507] Bump Dockerfile to 0.0.1-75-eb38f669
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 845ecf5d..2aecc528 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-74-3757063f
+ENV STELLAR_CORE_VERSION 0.0.1-75-eb38f669
EXPOSE 39133
EXPOSE 39132
From 2aa0ede7fbc9e7c25cc0e7e3c2d02c6e0799aa19 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 22 Jul 2015 01:14:59 +0000
Subject: [PATCH 0122/1507] Bump Dockerfile to 0.0.1-76-2ee44180
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 2aecc528..e127ea06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-75-eb38f669
+ENV STELLAR_CORE_VERSION 0.0.1-76-2ee44180
EXPOSE 39133
EXPOSE 39132
From 43714dd377edde451870a14b0648ff76bf85bbe4 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 22 Jul 2015 19:49:54 +0000
Subject: [PATCH 0123/1507] Bump Dockerfile to 0.0.1-77-12390a3c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e127ea06..c1ba70c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-76-2ee44180
+ENV STELLAR_CORE_VERSION 0.0.1-77-12390a3c
EXPOSE 39133
EXPOSE 39132
From cb04d20ad505f4ffe69c74afbbb579ade3f5be81 Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 23 Jul 2015 11:31:28 +0900
Subject: [PATCH 0124/1507] Add more context to logs in crash reports
---
utils/core_file_processor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/core_file_processor.py b/utils/core_file_processor.py
index 130f4746..f7bb7fd1 100755
--- a/utils/core_file_processor.py
+++ b/utils/core_file_processor.py
@@ -52,7 +52,7 @@ def find_logs(self, epoch_time):
formatted_time = format_time(epoch_time)
logging.info('Searching %s for logs around %s', log, formatted_time)
command = ["egrep",
- "-C50",
+ "-C1000",
("^%s" % formatted_time),
log]
try:
From 188740c455588ea81d4ded410ecd6b5cd4c96529 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 23 Jul 2015 05:14:31 +0000
Subject: [PATCH 0125/1507] Bump Dockerfile to 0.0.1-78-8babef09
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c1ba70c8..9280e755 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-77-12390a3c
+ENV STELLAR_CORE_VERSION 0.0.1-78-8babef09
EXPOSE 39133
EXPOSE 39132
From 630b87aa9e7ca804ef6d72dec01d249dd3fefffd Mon Sep 17 00:00:00 2001
From: Mat Schaffer
Date: Thu, 23 Jul 2015 17:01:01 +0900
Subject: [PATCH 0126/1507] Switch binary location to match latest stellar-core
master
---
fuzz/trace | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fuzz/trace b/fuzz/trace
index 5c5c7b3c..e5041736 100755
--- a/fuzz/trace
+++ b/fuzz/trace
@@ -16,7 +16,7 @@ apt-get install -qq libstdc++6 libpq5 lldb-3.6
cat > /etc/core_file_processor.ini <
Date: Sat, 25 Jul 2015 01:25:15 +0000
Subject: [PATCH 0127/1507] Bump Dockerfile to 0.0.1-79-7ab013c9
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9280e755..d95ab2a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-78-8babef09
+ENV STELLAR_CORE_VERSION 0.0.1-79-7ab013c9
EXPOSE 39133
EXPOSE 39132
From a3b0657fd699554a75242a7aa89c37eff58b3251 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 25 Jul 2015 01:55:24 +0000
Subject: [PATCH 0128/1507] Bump Dockerfile to 0.0.1-80-e93badc2
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d95ab2a8..99001c23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-79-7ab013c9
+ENV STELLAR_CORE_VERSION 0.0.1-80-e93badc2
EXPOSE 39133
EXPOSE 39132
From 3db562c121da770f65ff626d23618674db70a2d8 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 25 Jul 2015 02:34:15 +0000
Subject: [PATCH 0129/1507] Bump Dockerfile to 0.0.1-81-06f289de
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 99001c23..235088a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-80-e93badc2
+ENV STELLAR_CORE_VERSION 0.0.1-81-06f289de
EXPOSE 39133
EXPOSE 39132
From 6ecd056121ea83d97048c7acb35501911fd6ff6f Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Mon, 27 Jul 2015 12:08:26 -0700
Subject: [PATCH 0130/1507] Make VALIDATION_SEED conditional.
---
confd/templates/stellar-core.cfg.tmpl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/confd/templates/stellar-core.cfg.tmpl b/confd/templates/stellar-core.cfg.tmpl
index 97cee693..b04834ec 100644
--- a/confd/templates/stellar-core.cfg.tmpl
+++ b/confd/templates/stellar-core.cfg.tmpl
@@ -13,7 +13,9 @@ CATCHUP_COMPLETE={{getenv "CATCHUP_COMPLETE"}}
{{end}}
PEER_SEED="{{getenv (printf "%s_PEER_SEED" (getenv "SELF"))}}"
+{{if (getenv (printf "%s_VALIDATION_SEED" (getenv "SELF")))}}
VALIDATION_SEED="{{getenv (printf "%s_VALIDATION_SEED" (getenv "SELF"))}}"
+{{end}}
TARGET_PEER_CONNECTIONS=20
From 8c9781218d84b3bc3817a48ed7cc5b9087a7e336 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 29 Jul 2015 17:44:04 +0000
Subject: [PATCH 0131/1507] Bump Dockerfile to 0.0.1-82-7458449c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 235088a3..e61fbe3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-81-06f289de
+ENV STELLAR_CORE_VERSION 0.0.1-82-7458449c
EXPOSE 39133
EXPOSE 39132
From adc495801c3ff4fc3bde71f2f25ec70b06436971 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 29 Jul 2015 22:04:18 +0000
Subject: [PATCH 0132/1507] Bump Dockerfile to 0.0.1-83-1c1cc292
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e61fbe3c..4c23242f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-82-7458449c
+ENV STELLAR_CORE_VERSION 0.0.1-83-1c1cc292
EXPOSE 39133
EXPOSE 39132
From f468ec800eb658ff2fedc192a320257d51f1fdc6 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 30 Jul 2015 04:24:37 +0000
Subject: [PATCH 0133/1507] Bump Dockerfile to 0.0.1-84-3223baec
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 4c23242f..ae245a88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-83-1c1cc292
+ENV STELLAR_CORE_VERSION 0.0.1-84-3223baec
EXPOSE 39133
EXPOSE 39132
From d2f0a46d9df00025710c0aac8505f6ad06565811 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 30 Jul 2015 22:04:20 +0000
Subject: [PATCH 0134/1507] Bump Dockerfile to 0.0.1-85-4f042ddd
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ae245a88..de4dd158 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-84-3223baec
+ENV STELLAR_CORE_VERSION 0.0.1-85-4f042ddd
EXPOSE 39133
EXPOSE 39132
From d0dae0682e74f6578cf12d8a06ddaca72a9bf271 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 31 Jul 2015 05:14:23 +0000
Subject: [PATCH 0135/1507] Bump Dockerfile to 0.0.1-86-a888472d
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index de4dd158..49ca12b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-85-4f042ddd
+ENV STELLAR_CORE_VERSION 0.0.1-86-a888472d
EXPOSE 39133
EXPOSE 39132
From 2bf278545a4f88b2d88b5922417311ed44745fc2 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 31 Jul 2015 15:29:55 +0000
Subject: [PATCH 0136/1507] Bump Dockerfile to 0.0.1-87-232dc9ed
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 49ca12b9..493150e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-86-a888472d
+ENV STELLAR_CORE_VERSION 0.0.1-87-232dc9ed
EXPOSE 39133
EXPOSE 39132
From a1706cf72f2bacc858e6bcea13a65c452a8d34ec Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 31 Jul 2015 19:24:49 +0000
Subject: [PATCH 0137/1507] Bump Dockerfile to 0.0.1-88-906e5443
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 493150e4..6b688dc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-87-232dc9ed
+ENV STELLAR_CORE_VERSION 0.0.1-88-906e5443
EXPOSE 39133
EXPOSE 39132
From baf12abd99439bcd0fc24414872488ec6255c075 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 31 Jul 2015 22:09:04 +0000
Subject: [PATCH 0138/1507] Bump Dockerfile to 0.0.1-90-c549a165
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 6b688dc8..d8d3fb88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-88-906e5443
+ENV STELLAR_CORE_VERSION 0.0.1-90-c549a165
EXPOSE 39133
EXPOSE 39132
From 7e70735d0c35e92a0830d8a6bd4ffc65220ff347 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 4 Aug 2015 20:39:50 +0000
Subject: [PATCH 0139/1507] Bump Dockerfile to 0.0.1-91-b7d7489e
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d8d3fb88..26f3c8ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-90-c549a165
+ENV STELLAR_CORE_VERSION 0.0.1-91-b7d7489e
EXPOSE 39133
EXPOSE 39132
From 4f168dd72cdb602421bec61b3dcf18092ee6c7fb Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 4 Aug 2015 21:10:13 +0000
Subject: [PATCH 0140/1507] Bump Dockerfile to 0.0.1-92-d6df77db
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 26f3c8ed..cd2efeae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-91-b7d7489e
+ENV STELLAR_CORE_VERSION 0.0.1-92-d6df77db
EXPOSE 39133
EXPOSE 39132
From 9a1247a92bb81c11efcf04d773e02ac4ec3b81d7 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 4 Aug 2015 21:40:18 +0000
Subject: [PATCH 0141/1507] Bump Dockerfile to 0.0.1-93-0284c24c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index cd2efeae..20d2b87d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-92-d6df77db
+ENV STELLAR_CORE_VERSION 0.0.1-93-0284c24c
EXPOSE 39133
EXPOSE 39132
From 65596635fa8f005ef653a0c07903e4d0afc0b0a1 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 5 Aug 2015 00:30:18 +0000
Subject: [PATCH 0142/1507] Bump Dockerfile to 0.0.1-94-450cd535
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 20d2b87d..db8fd2af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-93-0284c24c
+ENV STELLAR_CORE_VERSION 0.0.1-94-450cd535
EXPOSE 39133
EXPOSE 39132
From cd9fdfd16d9994ff40e07a71bf5f9c72c2f80fd7 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 5 Aug 2015 09:25:20 +0000
Subject: [PATCH 0143/1507] Bump Dockerfile to 0.0.1-95-f1ea3554
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index db8fd2af..be37c90b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-94-450cd535
+ENV STELLAR_CORE_VERSION 0.0.1-95-f1ea3554
EXPOSE 39133
EXPOSE 39132
From b978b97e6e6ae0f134cf6fc9ec3fc25902912b20 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 6 Aug 2015 16:20:30 +0000
Subject: [PATCH 0144/1507] Bump Dockerfile to 0.0.1-96-49345b34
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index be37c90b..ff0c8be9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-95-f1ea3554
+ENV STELLAR_CORE_VERSION 0.0.1-96-49345b34
EXPOSE 39133
EXPOSE 39132
From 11a0cd37a614b81b96ec8274bc22867bb22a7b32 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 7 Aug 2015 02:55:25 +0000
Subject: [PATCH 0145/1507] Bump Dockerfile to 0.0.1-97-e688ed99
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ff0c8be9..96df31fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-96-49345b34
+ENV STELLAR_CORE_VERSION 0.0.1-97-e688ed99
EXPOSE 39133
EXPOSE 39132
From 4b76a8aa93d16ce4d75f0a7640e512760a63fb6c Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 7 Aug 2015 16:59:36 +0000
Subject: [PATCH 0146/1507] Bump Dockerfile to 0.0.1-98-1ca7a372
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 96df31fc..1bfdfaa8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-97-e688ed99
+ENV STELLAR_CORE_VERSION 0.0.1-98-1ca7a372
EXPOSE 39133
EXPOSE 39132
From 84c007c30949adff02dde2a7b58d1e2910efd4ce Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 7 Aug 2015 18:22:36 +0000
Subject: [PATCH 0147/1507] Bump Dockerfile to 0.0.1-99-bf290233
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 1bfdfaa8..8d1cfbf4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-98-1ca7a372
+ENV STELLAR_CORE_VERSION 0.0.1-99-bf290233
EXPOSE 39133
EXPOSE 39132
From 3022803ac4ff038dc885db69610557f4924027da Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 7 Aug 2015 18:59:44 +0000
Subject: [PATCH 0148/1507] Bump Dockerfile to 0.0.1-100-bb6a28db
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8d1cfbf4..9a71f514 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-99-bf290233
+ENV STELLAR_CORE_VERSION 0.0.1-100-bb6a28db
EXPOSE 39133
EXPOSE 39132
From 5c04634a7c99c8342364e8a085f4e9007d4b0ce6 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 7 Aug 2015 22:29:24 +0000
Subject: [PATCH 0149/1507] Bump Dockerfile to 0.0.1-101-f476a700
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9a71f514..40a6ef7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-100-bb6a28db
+ENV STELLAR_CORE_VERSION 0.0.1-101-f476a700
EXPOSE 39133
EXPOSE 39132
From 3fc9a8d34ce9d4b81bc3a8fa0597c88d9a12aac5 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 8 Aug 2015 03:30:01 +0000
Subject: [PATCH 0150/1507] Bump Dockerfile to 0.0.1-102-69ec10e5
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 40a6ef7f..22df8250 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-101-f476a700
+ENV STELLAR_CORE_VERSION 0.0.1-102-69ec10e5
EXPOSE 39133
EXPOSE 39132
From c7f7662feec0a5636f61377a3da5dbfabb7e5f72 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sun, 9 Aug 2015 00:35:07 +0000
Subject: [PATCH 0151/1507] Bump Dockerfile to 0.0.1-103-3313b1dd
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 22df8250..f2000e20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-102-69ec10e5
+ENV STELLAR_CORE_VERSION 0.0.1-103-3313b1dd
EXPOSE 39133
EXPOSE 39132
From bacbbf7fb45be711cf4db25a37c6cd97ef4625e9 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sun, 9 Aug 2015 02:29:44 +0000
Subject: [PATCH 0152/1507] Bump Dockerfile to 0.0.1-104-8decbe0f
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index f2000e20..80e54520 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-103-3313b1dd
+ENV STELLAR_CORE_VERSION 0.0.1-104-8decbe0f
EXPOSE 39133
EXPOSE 39132
From b49714429c3c62f0f3e4ba15beec32bbfc3d4b93 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sun, 9 Aug 2015 05:17:22 +0000
Subject: [PATCH 0153/1507] Bump Dockerfile to 0.0.1-105-610d0eb0
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 80e54520..8dad59eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-104-8decbe0f
+ENV STELLAR_CORE_VERSION 0.0.1-105-610d0eb0
EXPOSE 39133
EXPOSE 39132
From dc577490d4b728aca5cd3b170bc5e9771e7d210f Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 11 Aug 2015 01:49:48 +0000
Subject: [PATCH 0154/1507] Bump Dockerfile to 0.0.1-107-47d89671
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8dad59eb..66f379b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-105-610d0eb0
+ENV STELLAR_CORE_VERSION 0.0.1-107-47d89671
EXPOSE 39133
EXPOSE 39132
From 111f5125767d759cd3d8303877847c6b36bb9999 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 11 Aug 2015 05:08:47 +0000
Subject: [PATCH 0155/1507] Bump Dockerfile to 0.0.1-108-d27719b3
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 66f379b1..acc76813 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-107-47d89671
+ENV STELLAR_CORE_VERSION 0.0.1-108-d27719b3
EXPOSE 39133
EXPOSE 39132
From 37286d4aec48e7999a75f60f0ca59d52c9feda35 Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 11 Aug 2015 10:29:02 -0700
Subject: [PATCH 0156/1507] Change port numbers to match recent config changes.
---
Dockerfile | 4 ++--
Dockerfile.locally-build-deb | 4 ++--
README.md | 2 +-
examples/compat_complete.env | 4 ++--
examples/compat_minimal.env | 4 ++--
examples/local.env | 12 ++++++------
examples/single.env | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index acc76813..50f82673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,8 @@ MAINTAINER Mat Schaffer
ENV STELLAR_CORE_VERSION 0.0.1-108-d27719b3
-EXPOSE 39133
-EXPOSE 39132
+EXPOSE 11625
+EXPOSE 11626
VOLUME /data
VOLUME /heka
diff --git a/Dockerfile.locally-build-deb b/Dockerfile.locally-build-deb
index aa614d87..7bfebb07 100644
--- a/Dockerfile.locally-build-deb
+++ b/Dockerfile.locally-build-deb
@@ -2,8 +2,8 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-EXPOSE 39133
-EXPOSE 39132
+EXPOSE 11625
+EXPOSE 11626
VOLUME /data
VOLUME /heka
diff --git a/README.md b/README.md
index 76b5a3c1..511d1dbe 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The use of `-v ~/.aws:/root/.aws` here mounts your local aws credentials into th
You can check the cluster status with curl. The IP shown here is a typical boot2docker IP. Replace it with the IP of your docker host.
```sh
-watch 'echo 1 2 3 | xargs -n1 -I{} curl -s 192.168.59.103:3915{}/info'
+watch 'echo 6 7 3 | xargs -n1 -I{} curl -s 192.168.59.103:1162{}/info'
```
Basic clean up involves simply wiping out all containers. S3 history must be removed seperately. Something like this should do the trick.
diff --git a/examples/compat_complete.env b/examples/compat_complete.env
index af542439..de6befe6 100644
--- a/examples/compat_complete.env
+++ b/examples/compat_complete.env
@@ -1,8 +1,8 @@
POSTGRES_PASSWORD=mysecretpassword
compat_complete_POSTGRES_PORT=5541
-compat_complete_PEER_PORT=39241
-compat_complete_HTTP_PORT=39251
+compat_complete_PEER_PORT=11625
+compat_complete_HTTP_PORT=11626
compat_complete_PEER_SEED=sfywivCSC45TEDUT52NUNRzU7GeATcX5JTkn61mEBC6ogsB121W
compat_complete_VALIDATION_SEED=sfqBavsPzSxktPhQdJAqL1fscy4PW6AGPWqEAn1ha7evyups215
diff --git a/examples/compat_minimal.env b/examples/compat_minimal.env
index d8fa9794..5c131c63 100644
--- a/examples/compat_minimal.env
+++ b/examples/compat_minimal.env
@@ -1,8 +1,8 @@
POSTGRES_PASSWORD=mysecretpassword
compat_minimal_POSTGRES_PORT=5641
-compat_minimal_PEER_PORT=39341
-compat_minimal_HTTP_PORT=39351
+compat_minimal_PEER_PORT=11625
+compat_minimal_HTTP_PORT=11626
compat_minimal_PEER_SEED=sftaVy8HMFvSnPyRDp7Aa8Jdhtu9UXdXYiWzi8XNBzddjf66ghS
compat_minimal_VALIDATION_SEED=s34mVLvXageLWJ7nMZsQ8a7dgLyDHzdoLCB8UPnBwnJ8UbrJv1V
diff --git a/examples/local.env b/examples/local.env
index acea2c56..a799a0d9 100644
--- a/examples/local.env
+++ b/examples/local.env
@@ -2,20 +2,20 @@ POSTGRES_PASSWORD=mysecretpassword
HORIZON_PASSWORD=myreadonlyhorizonpassword
node1_POSTGRES_PORT=5441
-node1_PEER_PORT=39141
-node1_HTTP_PORT=39151
+node1_PEER_PORT=11625
+node1_HTTP_PORT=11626
node1_PEER_SEED=SCKYW6CVNBJPT6T3BPG3NXRXGCHPSIAVWNUJ35YNGXW2QIAWYJW2YEOP
node1_VALIDATION_SEED=SAJEJWKJAOELT2TJPTNLZXXSC3QXHKXDZD6NZLM3B6VQ7G22DQH5TC6C
node2_POSTGRES_PORT=5442
-node2_PEER_PORT=39142
-node2_HTTP_PORT=39152
+node2_PEER_PORT=11635
+node2_HTTP_PORT=11636
node2_PEER_SEED=SBTEQJMDYCNRXRBEUUK7PTC737GVE24VSFVEHQXRALAARQCU5O246KVT
node2_VALIDATION_SEED=SACTBO4KQ3LYYRRKBST3ZCO24FYRDP2CYN3W5IPP2OTC3NUIKFGZSRRY
node3_POSTGRES_PORT=5443
-node3_PEER_PORT=39143
-node3_HTTP_PORT=39153
+node3_PEER_PORT=11645
+node3_HTTP_PORT=11646
node3_PEER_SEED=SDU3BWZYYR2F6PBDUMXCN52JW4PQYID57LXZ47BNWDHUQ2SETZ4IIWPR
node3_VALIDATION_SEED=SCVXYFYE6BQYZD4O6J5ULJXRZYXLMKMXZEI3O3HGTQEB43UOY4XUZV3L
diff --git a/examples/single.env b/examples/single.env
index 7eccd062..0b43360f 100644
--- a/examples/single.env
+++ b/examples/single.env
@@ -15,8 +15,8 @@ CLUSTER_NAME=docker-single
# ATLAS_ADDRESS=http://localhost:7101/api/v1/publish
main_POSTGRES_PORT=5432
-main_PEER_PORT=39133
-main_HTTP_PORT=39132
+main_PEER_PORT=11625
+main_HTTP_PORT=11626
main_PEER_SEED=SAPTDXRE7AYZKZB2GRDHEI277Q2HQ5MO32XM3GWMGHK3FSIM5EXMYM62
main_VALIDATION_SEED=SACJC372QBSSKJYTV5A7LWT4NXWHTQO6GHG4QDAVC2XDPX6CNNXFZ4JK
From 5f5392869d5db42cef076838c82d3918378b3f30 Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 11 Aug 2015 10:29:54 -0700
Subject: [PATCH 0157/1507] Add recent cfg vars to stellar-core.cfg confd
template.
---
confd/templates/stellar-core.cfg.tmpl | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/confd/templates/stellar-core.cfg.tmpl b/confd/templates/stellar-core.cfg.tmpl
index b04834ec..350cc372 100644
--- a/confd/templates/stellar-core.cfg.tmpl
+++ b/confd/templates/stellar-core.cfg.tmpl
@@ -39,6 +39,16 @@ ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING={{getenv "ARTIFICIALLY_ACCELERATE_TIME_
COMMANDS={{getenv "COMMANDS"}}
{{end}}
+{{if (getenv "PARANOID_MODE")}}
+PARANOID_MODE={{getenv "PARANOID_MODE"}}
+{{end}}
+{{if (getenv "FAILURE_SAFETY")}}
+FAILURE_SAFETY={{getenv "FAILURE_SAFETY"}}
+{{end}}
+{{if (getenv "UNSAFE_QUORUM")}}
+UNSAFE_QUORUM={{getenv "UNSAFE_QUORUM"}}
+{{end}}
+
DATABASE="postgresql://dbname=stellar user=postgres password={{getenv "POSTGRES_PASSWORD"}} host=localhost port={{getenv (printf "%s_POSTGRES_PORT" (getenv "SELF"))}}"
[QUORUM_SET]
From 27762c7154bd490aea9d7b74d7851d1f9f4500ea Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 11 Aug 2015 10:30:48 -0700
Subject: [PATCH 0158/1507] Change QUORUM_SET -> VALIDATORS, THRESHOLD ->
THRESHOLD_PERCENT.
---
confd/templates/stellar-core.cfg.tmpl | 6 ++++--
examples/compat_complete.env | 2 +-
examples/compat_minimal.env | 2 +-
examples/local.env | 2 +-
examples/single.env | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/confd/templates/stellar-core.cfg.tmpl b/confd/templates/stellar-core.cfg.tmpl
index 350cc372..c2b83b4b 100644
--- a/confd/templates/stellar-core.cfg.tmpl
+++ b/confd/templates/stellar-core.cfg.tmpl
@@ -52,8 +52,10 @@ UNSAFE_QUORUM={{getenv "UNSAFE_QUORUM"}}
DATABASE="postgresql://dbname=stellar user=postgres password={{getenv "POSTGRES_PASSWORD"}} host=localhost port={{getenv (printf "%s_POSTGRES_PORT" (getenv "SELF"))}}"
[QUORUM_SET]
-THRESHOLD={{getenv "QUORUM_THRESHOLD"}}
-VALIDATORS={{getenv "QUORUM_SET"}}
+{{if (getenv "THRESHOLD_PERCENT")}}
+THRESHOLD_PERCENT={{getenv "THRESHOLD_PERCENT"}}
+{{end}}
+VALIDATORS={{getenv "VALIDATORS"}}
{{range jsonArray (getenv "HISTORY_PEERS")}}
[HISTORY.{{.}}]
diff --git a/examples/compat_complete.env b/examples/compat_complete.env
index de6befe6..42132ca1 100644
--- a/examples/compat_complete.env
+++ b/examples/compat_complete.env
@@ -12,7 +12,7 @@ PREFERRED_PEERS=["core-testnet1.stellar.org", "core-testnet2.stellar.org", "core
QUORUM_THRESHOLD=2
-QUORUM_SET=["gTDZhQ14WuP8rQ9SrkS1EhWNhZyybv97cHNsGRADKQtBoJpTTk", "gsjjWTsQP5C2HpcetiLz4LDa9VECGvZMTyhPUDWi57ZKafV5sA4", "gSCB2HML88CvMwt2iryJGdS61gDr2nhMeYFVWF2B4m6w5js73T"]
+VALIDATORS=["GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y", "GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP", "GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z"]
HISTORY_PEERS=["core-testnet-001", "core-testnet-002", "core-testnet-003"]
diff --git a/examples/compat_minimal.env b/examples/compat_minimal.env
index 5c131c63..31e314ff 100644
--- a/examples/compat_minimal.env
+++ b/examples/compat_minimal.env
@@ -10,7 +10,7 @@ PREFERRED_PEERS=["core-testnet1.stellar.org", "core-testnet2.stellar.org", "core
QUORUM_THRESHOLD=2
-QUORUM_SET=["gTDZhQ14WuP8rQ9SrkS1EhWNhZyybv97cHNsGRADKQtBoJpTTk", "gsjjWTsQP5C2HpcetiLz4LDa9VECGvZMTyhPUDWi57ZKafV5sA4", "gSCB2HML88CvMwt2iryJGdS61gDr2nhMeYFVWF2B4m6w5js73T"]
+VALIDATORS=["GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y", "GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP", "GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z"]
HISTORY_PEERS=["core-testnet-001", "core-testnet-002", "core-testnet-003"]
diff --git a/examples/local.env b/examples/local.env
index a799a0d9..d0fe7ee7 100644
--- a/examples/local.env
+++ b/examples/local.env
@@ -23,7 +23,7 @@ PREFERRED_PEERS=["127.0.0.1:39141", "127.0.0.1:39142", "127.0.0.1:39143"]
QUORUM_THRESHOLD=2
-QUORUM_SET=["GBB2FMDSJY2VMKKB4QRAXU32OEYV5WPW4CRXB3NQSSD4YENKRMGAC7NB", "GB4FD5MNQ73WYA47YM2PP443ZE2KUBUI2I36LZAECGZ37ABLUN257GSI", "GACI4DOR3ILATD6CAPNDAAWVFNCOB3YRQ7BXJ3R7D5K7ICEZOYS26QUN"]
+VALIDATORS=["GBB2FMDSJY2VMKKB4QRAXU32OEYV5WPW4CRXB3NQSSD4YENKRMGAC7NB", "GB4FD5MNQ73WYA47YM2PP443ZE2KUBUI2I36LZAECGZ37ABLUN257GSI", "GACI4DOR3ILATD6CAPNDAAWVFNCOB3YRQ7BXJ3R7D5K7ICEZOYS26QUN"]
HISTORY_GET=aws s3 cp --region eu-west-1 s3://history-stg.stellar.org/dev/core-docker/%s/{0} {1}
HISTORY_PUT=aws s3 cp --region eu-west-1 {0} s3://history-stg.stellar.org/dev/core-docker/%s/{1}
diff --git a/examples/single.env b/examples/single.env
index 0b43360f..2f975c90 100644
--- a/examples/single.env
+++ b/examples/single.env
@@ -24,7 +24,7 @@ main_VALIDATION_SEED=SACJC372QBSSKJYTV5A7LWT4NXWHTQO6GHG4QDAVC2XDPX6CNNXFZ4JK
QUORUM_THRESHOLD=1
PREFERRED_PEERS=["127.0.0.1:39133"]
-QUORUM_SET=["GD5KD2KEZJIGTC63IGW6UMUSMVUVG5IHG64HUTFWCHVZH2N2IBOQN7PS"]
+VALIDATORS=["GD5KD2KEZJIGTC63IGW6UMUSMVUVG5IHG64HUTFWCHVZH2N2IBOQN7PS"]
HISTORY_PEERS=["main"]
From 89124bc2e755b38568ef306c5106fc02a1fe3c49 Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Tue, 11 Aug 2015 10:31:02 -0700
Subject: [PATCH 0159/1507] Fix examples to match recent config changes.
---
examples/compat_complete.env | 7 ++++---
examples/compat_minimal.env | 7 ++++---
examples/local.env | 3 ++-
examples/single.env | 3 ++-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/examples/compat_complete.env b/examples/compat_complete.env
index 42132ca1..602d2472 100644
--- a/examples/compat_complete.env
+++ b/examples/compat_complete.env
@@ -3,14 +3,15 @@ POSTGRES_PASSWORD=mysecretpassword
compat_complete_POSTGRES_PORT=5541
compat_complete_PEER_PORT=11625
compat_complete_HTTP_PORT=11626
-compat_complete_PEER_SEED=sfywivCSC45TEDUT52NUNRzU7GeATcX5JTkn61mEBC6ogsB121W
-compat_complete_VALIDATION_SEED=sfqBavsPzSxktPhQdJAqL1fscy4PW6AGPWqEAn1ha7evyups215
+compat_complete_PEER_SEED=SBTEQJMDYCNRXRBEUUK7PTC737GVE24VSFVEHQXRALAARQCU5O246KVT
+compat_complete_VALIDATION_SEED=SACTBO4KQ3LYYRRKBST3ZCO24FYRDP2CYN3W5IPP2OTC3NUIKFGZSRRY
CATCHUP_COMPLETE=true
PREFERRED_PEERS=["core-testnet1.stellar.org", "core-testnet2.stellar.org", "core-testnet3.stellar.org"]
-QUORUM_THRESHOLD=2
+UNSAFE_QUORUM=true
+FAILURE_SAFETY=0
VALIDATORS=["GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y", "GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP", "GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z"]
diff --git a/examples/compat_minimal.env b/examples/compat_minimal.env
index 31e314ff..a07e369a 100644
--- a/examples/compat_minimal.env
+++ b/examples/compat_minimal.env
@@ -3,12 +3,13 @@ POSTGRES_PASSWORD=mysecretpassword
compat_minimal_POSTGRES_PORT=5641
compat_minimal_PEER_PORT=11625
compat_minimal_HTTP_PORT=11626
-compat_minimal_PEER_SEED=sftaVy8HMFvSnPyRDp7Aa8Jdhtu9UXdXYiWzi8XNBzddjf66ghS
-compat_minimal_VALIDATION_SEED=s34mVLvXageLWJ7nMZsQ8a7dgLyDHzdoLCB8UPnBwnJ8UbrJv1V
+compat_minimal_PEER_SEED=SBTEQJMDYCNRXRBEUUK7PTC737GVE24VSFVEHQXRALAARQCU5O246KVT
+compat_minimal_VALIDATION_SEED=SACTBO4KQ3LYYRRKBST3ZCO24FYRDP2CYN3W5IPP2OTC3NUIKFGZSRRY
PREFERRED_PEERS=["core-testnet1.stellar.org", "core-testnet2.stellar.org", "core-testnet3.stellar.org"]
-QUORUM_THRESHOLD=2
+UNSAFE_QUORUM=true
+FAILURE_SAFETY=0
VALIDATORS=["GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y", "GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP", "GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z"]
diff --git a/examples/local.env b/examples/local.env
index d0fe7ee7..60bb4440 100644
--- a/examples/local.env
+++ b/examples/local.env
@@ -21,7 +21,8 @@ node3_VALIDATION_SEED=SCVXYFYE6BQYZD4O6J5ULJXRZYXLMKMXZEI3O3HGTQEB43UOY4XUZV3L
PREFERRED_PEERS=["127.0.0.1:39141", "127.0.0.1:39142", "127.0.0.1:39143"]
-QUORUM_THRESHOLD=2
+UNSAFE_QUORUM=true
+FAILURE_SAFETY=0
VALIDATORS=["GBB2FMDSJY2VMKKB4QRAXU32OEYV5WPW4CRXB3NQSSD4YENKRMGAC7NB", "GB4FD5MNQ73WYA47YM2PP443ZE2KUBUI2I36LZAECGZ37ABLUN257GSI", "GACI4DOR3ILATD6CAPNDAAWVFNCOB3YRQ7BXJ3R7D5K7ICEZOYS26QUN"]
diff --git a/examples/single.env b/examples/single.env
index 2f975c90..a4107e2b 100644
--- a/examples/single.env
+++ b/examples/single.env
@@ -21,7 +21,8 @@ main_HTTP_PORT=11626
main_PEER_SEED=SAPTDXRE7AYZKZB2GRDHEI277Q2HQ5MO32XM3GWMGHK3FSIM5EXMYM62
main_VALIDATION_SEED=SACJC372QBSSKJYTV5A7LWT4NXWHTQO6GHG4QDAVC2XDPX6CNNXFZ4JK
-QUORUM_THRESHOLD=1
+UNSAFE_QUORUM=true
+FAILURE_SAFETY=0
PREFERRED_PEERS=["127.0.0.1:39133"]
VALIDATORS=["GD5KD2KEZJIGTC63IGW6UMUSMVUVG5IHG64HUTFWCHVZH2N2IBOQN7PS"]
From 8cfdb323c561b24bfb4c985fbe162024369bfaca Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 11 Aug 2015 18:59:32 +0000
Subject: [PATCH 0160/1507] Bump Dockerfile to 0.0.1-109-345a3bba
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 50f82673..15f26ac9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-108-d27719b3
+ENV STELLAR_CORE_VERSION 0.0.1-109-345a3bba
EXPOSE 11625
EXPOSE 11626
From ec79a7b7c7187e1242677cf95886edc2c2eecaae Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 12 Aug 2015 21:34:12 +0000
Subject: [PATCH 0161/1507] Bump Dockerfile to 0.0.1-110-c3d023c8
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 15f26ac9..628a0528 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-109-345a3bba
+ENV STELLAR_CORE_VERSION 0.0.1-110-c3d023c8
EXPOSE 11625
EXPOSE 11626
From 25c8b4ec6f5e24122b7d3ccc2b49936f718449b5 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 13 Aug 2015 23:01:26 +0000
Subject: [PATCH 0162/1507] Bump Dockerfile to 0.0.1-111-b4272b78
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 628a0528..ce915b01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-110-c3d023c8
+ENV STELLAR_CORE_VERSION 0.0.1-111-b4272b78
EXPOSE 11625
EXPOSE 11626
From eeae28f5e5da344dd29fa1970d17475abb5f8859 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 14 Aug 2015 00:00:17 +0000
Subject: [PATCH 0163/1507] Bump Dockerfile to 0.0.1-112-3a47f1ff
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ce915b01..460117fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-111-b4272b78
+ENV STELLAR_CORE_VERSION 0.0.1-112-3a47f1ff
EXPOSE 11625
EXPOSE 11626
From 919688733bf034e246707701bba3c43b60ffd1c4 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 14 Aug 2015 01:19:54 +0000
Subject: [PATCH 0164/1507] Bump Dockerfile to 0.0.1-113-1b34bbda
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 460117fa..2f1e007e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-112-3a47f1ff
+ENV STELLAR_CORE_VERSION 0.0.1-113-1b34bbda
EXPOSE 11625
EXPOSE 11626
From 5e4b43c24489d76274be8a5743893d06ae6e55c7 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 14 Aug 2015 18:19:48 +0000
Subject: [PATCH 0165/1507] Bump Dockerfile to 0.0.1-114-030e48a3
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 2f1e007e..6ba69a99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-113-1b34bbda
+ENV STELLAR_CORE_VERSION 0.0.1-114-030e48a3
EXPOSE 11625
EXPOSE 11626
From aaca83f6a78331061f849056eed2d5e87c1412f8 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 14 Aug 2015 21:09:22 +0000
Subject: [PATCH 0166/1507] Bump Dockerfile to 0.0.1-115-28231d6f
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 6ba69a99..cef0a027 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-114-030e48a3
+ENV STELLAR_CORE_VERSION 0.0.1-115-28231d6f
EXPOSE 11625
EXPOSE 11626
From 08a7022f617a93a23d5bfc7e128fd6ddd73b089f Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Sat, 15 Aug 2015 16:04:11 +0000
Subject: [PATCH 0167/1507] Bump Dockerfile to 0.0.1-116-b179493a
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index cef0a027..3c6a4d9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-115-28231d6f
+ENV STELLAR_CORE_VERSION 0.0.1-116-b179493a
EXPOSE 11625
EXPOSE 11626
From 57c2b8834f1428bd7858ebfd770352db39970f28 Mon Sep 17 00:00:00 2001
From: Graydon Hoare
Date: Mon, 17 Aug 2015 13:28:21 -0700
Subject: [PATCH 0168/1507] Connect to postgresql over unix domain sockets.
---
Dockerfile | 1 +
confd/conf.d/pgpass.toml | 4 ----
confd/templates/pgpass.tmpl | 1 -
confd/templates/psql.sh.tmpl | 3 +--
confd/templates/stellar-core.cfg.tmpl | 2 +-
5 files changed, 3 insertions(+), 8 deletions(-)
delete mode 100644 confd/conf.d/pgpass.toml
delete mode 100644 confd/templates/pgpass.tmpl
diff --git a/Dockerfile b/Dockerfile
index 3c6a4d9e..98f1fa67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ EXPOSE 11625
EXPOSE 11626
VOLUME /data
+VOLUME /postgresql-unix-sockets
VOLUME /heka
ADD install /
diff --git a/confd/conf.d/pgpass.toml b/confd/conf.d/pgpass.toml
deleted file mode 100644
index be74560e..00000000
--- a/confd/conf.d/pgpass.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[template]
-src = "pgpass.tmpl"
-dest = "/root/.pgpass"
-mode = "0600"
diff --git a/confd/templates/pgpass.tmpl b/confd/templates/pgpass.tmpl
deleted file mode 100644
index b4a02fe1..00000000
--- a/confd/templates/pgpass.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-localhost:{{getenv (printf "%s_POSTGRES_PORT" (getenv "SELF"))}}:*:postgres:{{getenv "POSTGRES_PASSWORD"}}
diff --git a/confd/templates/psql.sh.tmpl b/confd/templates/psql.sh.tmpl
index eecae2c9..d22401cc 100644
--- a/confd/templates/psql.sh.tmpl
+++ b/confd/templates/psql.sh.tmpl
@@ -1,4 +1,3 @@
-export PGHOST=localhost
-export PGPORT={{getenv (printf "%s_POSTGRES_PORT" (getenv "SELF"))}}
+export PGHOST=/postgresql-unix-sockets
export PGDATABASE=postgres
export PGUSER=postgres
diff --git a/confd/templates/stellar-core.cfg.tmpl b/confd/templates/stellar-core.cfg.tmpl
index c2b83b4b..a0e0495f 100644
--- a/confd/templates/stellar-core.cfg.tmpl
+++ b/confd/templates/stellar-core.cfg.tmpl
@@ -49,7 +49,7 @@ FAILURE_SAFETY={{getenv "FAILURE_SAFETY"}}
UNSAFE_QUORUM={{getenv "UNSAFE_QUORUM"}}
{{end}}
-DATABASE="postgresql://dbname=stellar user=postgres password={{getenv "POSTGRES_PASSWORD"}} host=localhost port={{getenv (printf "%s_POSTGRES_PORT" (getenv "SELF"))}}"
+DATABASE="postgresql://dbname=stellar user=postgres host=/postgresql-unix-sockets"
[QUORUM_SET]
{{if (getenv "THRESHOLD_PERCENT")}}
From 4cde505b24799ab318befde45ec2c98199ed00da Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 18 Aug 2015 05:50:07 +0000
Subject: [PATCH 0169/1507] Bump Dockerfile to 0.0.1-117-72b501fd
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 98f1fa67..0912ca56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-116-b179493a
+ENV STELLAR_CORE_VERSION 0.0.1-117-72b501fd
EXPOSE 11625
EXPOSE 11626
From c9c5f7460eb9e03c96b0e9393f67e056075e9d8f Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 19 Aug 2015 23:04:00 +0000
Subject: [PATCH 0170/1507] Bump Dockerfile to 0.0.1-118-8a1bc71c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 0912ca56..3b0ef6a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-117-72b501fd
+ENV STELLAR_CORE_VERSION 0.0.1-118-8a1bc71c
EXPOSE 11625
EXPOSE 11626
From 156b751e05216c185ccba008da884f1374d1d2fd Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 21 Aug 2015 23:44:26 +0000
Subject: [PATCH 0171/1507] Bump Dockerfile to 0.0.1-119-e8b85983
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 3b0ef6a5..3c9dfd62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-118-8a1bc71c
+ENV STELLAR_CORE_VERSION 0.0.1-119-e8b85983
EXPOSE 11625
EXPOSE 11626
From 8ab3bc0131f9ee266cc374968f44a86af357a7ba Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 25 Aug 2015 00:45:10 +0000
Subject: [PATCH 0172/1507] Bump Dockerfile to 0.0.1-120-faba6453
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 3c9dfd62..c011c710 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-119-e8b85983
+ENV STELLAR_CORE_VERSION 0.0.1-120-faba6453
EXPOSE 11625
EXPOSE 11626
From 4e86fc1fe20c5887739ecc6219b1ff68dc245214 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 28 Aug 2015 20:59:32 +0000
Subject: [PATCH 0173/1507] Bump Dockerfile to 0.0.1-121-5182572c
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c011c710..dd2fc68b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-120-faba6453
+ENV STELLAR_CORE_VERSION 0.0.1-121-5182572c
EXPOSE 11625
EXPOSE 11626
From e1c5ce31eec4440a819c82084d9ab66cff002085 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 1 Sep 2015 18:22:51 +0000
Subject: [PATCH 0174/1507] Bump Dockerfile to 0.0.1-122-66abf9d3
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index dd2fc68b..bdf98e2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-121-5182572c
+ENV STELLAR_CORE_VERSION 0.0.1-122-66abf9d3
EXPOSE 11625
EXPOSE 11626
From 4be2f3ae2bb59108bb1fbc39701a37155f5914e6 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 1 Sep 2015 22:42:11 +0000
Subject: [PATCH 0175/1507] Bump Dockerfile to 0.0.1-123-36526f82
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index bdf98e2d..eb683a5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-122-66abf9d3
+ENV STELLAR_CORE_VERSION 0.0.1-123-36526f82
EXPOSE 11625
EXPOSE 11626
From 01cebbfe86f915edf523d7745488dfc1fc71e669 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 2 Sep 2015 19:22:49 +0000
Subject: [PATCH 0176/1507] Bump Dockerfile to 0.0.1-124-e4950d05
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index eb683a5e..5803fb8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-123-36526f82
+ENV STELLAR_CORE_VERSION 0.0.1-124-e4950d05
EXPOSE 11625
EXPOSE 11626
From 2413c114d84ef19102da3b94e3546834131c8659 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 2 Sep 2015 23:04:53 +0000
Subject: [PATCH 0177/1507] Bump Dockerfile to 0.0.1-125-e5099335
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 5803fb8b..80e2ae82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-124-e4950d05
+ENV STELLAR_CORE_VERSION 0.0.1-125-e5099335
EXPOSE 11625
EXPOSE 11626
From a333d402224704b147917a182bcd9a86b6702baf Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 3 Sep 2015 23:44:43 +0000
Subject: [PATCH 0178/1507] Bump Dockerfile to 0.0.1-126-17cc54a2
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 80e2ae82..03452056 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-125-e5099335
+ENV STELLAR_CORE_VERSION 0.0.1-126-17cc54a2
EXPOSE 11625
EXPOSE 11626
From bc0e38058cc956c832feae7c79ac1cebb8fd4475 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 3 Sep 2015 23:57:45 +0000
Subject: [PATCH 0179/1507] Bump Dockerfile to 0.0.1-127-a385634f
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 03452056..5b768cdb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-126-17cc54a2
+ENV STELLAR_CORE_VERSION 0.0.1-127-a385634f
EXPOSE 11625
EXPOSE 11626
From f34c8c9b918cd67e1a2323c5e5b68604b9849d37 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 4 Sep 2015 00:18:01 +0000
Subject: [PATCH 0180/1507] Bump Dockerfile to 0.0.1-128-cf0f660d
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 5b768cdb..e95f393b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-127-a385634f
+ENV STELLAR_CORE_VERSION 0.0.1-128-cf0f660d
EXPOSE 11625
EXPOSE 11626
From 7d177127dc3bd3d844bde03dbe01ffdb10c34942 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 4 Sep 2015 21:28:11 +0000
Subject: [PATCH 0181/1507] Bump Dockerfile to 0.0.1-129-20851645
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e95f393b..0220aa39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-128-cf0f660d
+ENV STELLAR_CORE_VERSION 0.0.1-129-20851645
EXPOSE 11625
EXPOSE 11626
From 8c979237b79a6f793e99c1d0750db529a58b6ba0 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Fri, 4 Sep 2015 22:23:45 +0000
Subject: [PATCH 0182/1507] Bump Dockerfile to 0.0.1-130-0f8cc6ee
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 0220aa39..342dd2fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-129-20851645
+ENV STELLAR_CORE_VERSION 0.0.1-130-0f8cc6ee
EXPOSE 11625
EXPOSE 11626
From 3238f9beacbdbf0d79afbb0de3b5b155afefd420 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Mon, 7 Sep 2015 19:57:50 +0000
Subject: [PATCH 0183/1507] Bump Dockerfile to 0.0.1-131-b9bb2cb0
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 342dd2fd..b2bf6a7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-130-0f8cc6ee
+ENV STELLAR_CORE_VERSION 0.0.1-131-b9bb2cb0
EXPOSE 11625
EXPOSE 11626
From 8637bad22ab7323298ae29c00aa6157b3e00627b Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 8 Sep 2015 01:42:19 +0000
Subject: [PATCH 0184/1507] Bump Dockerfile to 0.0.1-132-4654e395
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index b2bf6a7f..ea1f6ed4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-131-b9bb2cb0
+ENV STELLAR_CORE_VERSION 0.0.1-132-4654e395
EXPOSE 11625
EXPOSE 11626
From 71ee99a77aea9379d7a48ba8b9fae576cca72205 Mon Sep 17 00:00:00 2001
From: Scott Fleckenstein
Date: Tue, 8 Sep 2015 10:52:52 -0700
Subject: [PATCH 0185/1507] Add network passphrase to stellar-core.cfg template
---
confd/templates/stellar-core.cfg.tmpl | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/confd/templates/stellar-core.cfg.tmpl b/confd/templates/stellar-core.cfg.tmpl
index a0e0495f..12c0d5b4 100644
--- a/confd/templates/stellar-core.cfg.tmpl
+++ b/confd/templates/stellar-core.cfg.tmpl
@@ -68,3 +68,10 @@ mkdir="{{printf (getenv "HISTORY_MKDIR") (getenv "SELF")}}"
{{end}}
{{end}}
+
+
+{{if (getenv "NETWORK_PASSPHRASE")}}
+NETWORK_PASSPHRASE="{{getenv "NETWORK_PASSPHRASE"}}"
+{{else}}
+NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
+{{end}}
From 4169ea1d03994c8cb5da34c2ac935ff1e6241e75 Mon Sep 17 00:00:00 2001
From: Scott Fleckenstein
Date: Tue, 8 Sep 2015 11:04:18 -0700
Subject: [PATCH 0186/1507] Update example files, add testnet passphrase
---
examples/compat_complete.env | 2 ++
examples/compat_minimal.env | 2 ++
examples/local.env | 2 ++
examples/single.env | 1 +
4 files changed, 7 insertions(+)
diff --git a/examples/compat_complete.env b/examples/compat_complete.env
index 602d2472..4e753d34 100644
--- a/examples/compat_complete.env
+++ b/examples/compat_complete.env
@@ -18,3 +18,5 @@ VALIDATORS=["GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y", "GCUCJTI
HISTORY_PEERS=["core-testnet-001", "core-testnet-002", "core-testnet-003"]
HISTORY_GET=wget -q -O {1} https://s3-eu-west-1.amazonaws.com/history.stellar.org/prd/core-testnet/%s/{0}
+
+NETWORK_PASSPHRASE=Test SDF Network ; September 2015
diff --git a/examples/compat_minimal.env b/examples/compat_minimal.env
index a07e369a..f8464cd2 100644
--- a/examples/compat_minimal.env
+++ b/examples/compat_minimal.env
@@ -16,3 +16,5 @@ VALIDATORS=["GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y", "GCUCJTI
HISTORY_PEERS=["core-testnet-001", "core-testnet-002", "core-testnet-003"]
HISTORY_GET=wget -q -O {1} https://s3-eu-west-1.amazonaws.com/history.stellar.org/prd/core-testnet/%s/{0}
+
+NETWORK_PASSPHRASE=Test SDF Network ; September 2015
diff --git a/examples/local.env b/examples/local.env
index 60bb4440..91c01c54 100644
--- a/examples/local.env
+++ b/examples/local.env
@@ -31,3 +31,5 @@ HISTORY_PUT=aws s3 cp --region eu-west-1 {0} s3://history-stg.stellar.org/dev/co
HISTORY_RESET=aws s3 rm --recursive --region eu-west-1 s3://history-stg.stellar.org/dev/core-docker/%s
HISTORY_PEERS=["node1", "node2", "node3"]
+
+NETWORK_PASSPHRASE=Test SDF Network ; September 2015
diff --git a/examples/single.env b/examples/single.env
index a4107e2b..eeed6f6b 100644
--- a/examples/single.env
+++ b/examples/single.env
@@ -33,3 +33,4 @@ HISTORY_GET=cp history/%s/{0} {1}
HISTORY_PUT=cp {0} history/%s/{1}
HISTORY_MKDIR=mkdir -p history/%s/{0}
+NETWORK_PASSPHRASE=Test SDF Network ; September 2015
From b7b0b9e57e2d947219c4a78dae77e79be3ba5898 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Tue, 8 Sep 2015 23:27:10 +0000
Subject: [PATCH 0187/1507] Bump Dockerfile to 0.0.1-133-d70f259d
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index ea1f6ed4..35b18ad1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-132-4654e395
+ENV STELLAR_CORE_VERSION 0.0.1-133-d70f259d
EXPOSE 11625
EXPOSE 11626
From befaf9c4ca21d88c5622778d09a35e5ce445f7c4 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 9 Sep 2015 00:42:00 +0000
Subject: [PATCH 0188/1507] Bump Dockerfile to 0.0.1-134-62b50500
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 35b18ad1..65c6da5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-133-d70f259d
+ENV STELLAR_CORE_VERSION 0.0.1-134-62b50500
EXPOSE 11625
EXPOSE 11626
From 7d6b3fafec28c0a2c5ee3a69b6045713393696a8 Mon Sep 17 00:00:00 2001
From: Scott Fleckenstein
Date: Tue, 8 Sep 2015 19:34:32 -0700
Subject: [PATCH 0189/1507] Move NETWORK_PASSPHRASE before table sections
---
confd/templates/stellar-core.cfg.tmpl | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/confd/templates/stellar-core.cfg.tmpl b/confd/templates/stellar-core.cfg.tmpl
index 12c0d5b4..c31a98fb 100644
--- a/confd/templates/stellar-core.cfg.tmpl
+++ b/confd/templates/stellar-core.cfg.tmpl
@@ -51,6 +51,12 @@ UNSAFE_QUORUM={{getenv "UNSAFE_QUORUM"}}
DATABASE="postgresql://dbname=stellar user=postgres host=/postgresql-unix-sockets"
+{{if (getenv "NETWORK_PASSPHRASE")}}
+NETWORK_PASSPHRASE="{{getenv "NETWORK_PASSPHRASE"}}"
+{{else}}
+NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
+{{end}}
+
[QUORUM_SET]
{{if (getenv "THRESHOLD_PERCENT")}}
THRESHOLD_PERCENT={{getenv "THRESHOLD_PERCENT"}}
@@ -68,10 +74,3 @@ mkdir="{{printf (getenv "HISTORY_MKDIR") (getenv "SELF")}}"
{{end}}
{{end}}
-
-
-{{if (getenv "NETWORK_PASSPHRASE")}}
-NETWORK_PASSPHRASE="{{getenv "NETWORK_PASSPHRASE"}}"
-{{else}}
-NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
-{{end}}
From c7b1598f35481a20c2c2e9d3fca81f2695ecd9cf Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 9 Sep 2015 16:57:37 +0000
Subject: [PATCH 0190/1507] Bump Dockerfile to 0.0.1-136-3a661988
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 65c6da5c..749e6856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-134-62b50500
+ENV STELLAR_CORE_VERSION 0.0.1-136-3a661988
EXPOSE 11625
EXPOSE 11626
From b345d2e2001ec7c9ddea96c6b49745b59826a95f Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Wed, 9 Sep 2015 23:42:05 +0000
Subject: [PATCH 0191/1507] Bump Dockerfile to 0.0.1-137-83ab4601
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 749e6856..deaf08c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-136-3a661988
+ENV STELLAR_CORE_VERSION 0.0.1-137-83ab4601
EXPOSE 11625
EXPOSE 11626
From 3a7a587de1dbad42854b81b02a3cf405190f1ac1 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 10 Sep 2015 00:02:15 +0000
Subject: [PATCH 0192/1507] Bump Dockerfile to 0.0.1-138-21c59668
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index deaf08c4..25ee19d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-137-83ab4601
+ENV STELLAR_CORE_VERSION 0.0.1-138-21c59668
EXPOSE 11625
EXPOSE 11626
From 53b7990c2420e3c3d74ffb58405d89dd82d3b2b3 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 10 Sep 2015 01:12:00 +0000
Subject: [PATCH 0193/1507] Bump Dockerfile to 0.0.1-139-b97bbdc4
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 25ee19d7..61a77d2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-138-21c59668
+ENV STELLAR_CORE_VERSION 0.0.1-139-b97bbdc4
EXPOSE 11625
EXPOSE 11626
From bd860155ff4a660fdd1ca12f52d44a4834275e18 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Thu, 10 Sep 2015 18:13:07 +0000
Subject: [PATCH 0194/1507] Bump Dockerfile to 0.0.1-140-ad6891f4
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 61a77d2a..9af22a54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-139-b97bbdc4
+ENV STELLAR_CORE_VERSION 0.0.1-140-ad6891f4
EXPOSE 11625
EXPOSE 11626
From 4f0ac1d389940955539407a1b7d43df1f40e2d66 Mon Sep 17 00:00:00 2001
From: stellar-jenkins
Date: Mon, 14 Sep 2015 18:08:49 +0000
Subject: [PATCH 0195/1507] Bump Dockerfile to 0.0.1-141-ea286b44
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9af22a54..50bc6f03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM stellar/base:latest
MAINTAINER Mat Schaffer
-ENV STELLAR_CORE_VERSION 0.0.1-140-ad6891f4
+ENV STELLAR_CORE_VERSION 0.0.1-141-ea286b44
EXPOSE 11625
EXPOSE 11626
From b0d43e8375fc5032b6c661464a4f0e828dd7a8de Mon Sep 17 00:00:00 2001
From: stellar-jenkins