From 805e84437cb2a1d1eefc7b7fed2dc6afa5421520 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 31 Jul 2021 17:53:03 +0300 Subject: Fix Docker tests - also add dcat example --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 8632832..779f75d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # The container can be used for developing and testing # Purposes -FROM fedora:33 +FROM fedora:34 RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver ADD ./dtail.json /etc/dserver/dtail.json -- cgit v1.2.3 From 62bf0b0e9c2d5420349ad9c365d9484fc0a1c46b Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 12 Sep 2021 19:04:42 +0300 Subject: bugfix: dmap skipped the last couple of mapreduce lines --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 779f75d..da3b0db 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,6 +7,7 @@ RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver ADD ./dtail.json /etc/dserver/dtail.json ADD ./dserver /usr/local/bin/dserver +ADD ./mapr_testdata.log /var/log/mapr_testdata.log RUN useradd dserver RUN chown -R dserver /var/run/dserver /var/log/dserver -- cgit v1.2.3 From 7fe0c079f79f4da468e6195ed9453bc2d1f1822d Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 29 Oct 2021 08:25:17 +0300 Subject: rename relaxed auth flag --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index da3b0db..3cc5f6a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,4 +16,4 @@ USER dserver WORKDIR /var/run/dserver EXPOSE 2222/tcp -CMD ["/usr/local/bin/dserver", "-relaxedAuth", "-cfg", "/etc/dserver/dtail.json"] +CMD ["/usr/local/bin/dserver", "-RELAXED_AUTH_I_AM_REALLY_SURE", "-cfg", "/etc/dserver/dtail.json"] -- cgit v1.2.3 From cc3db06c59b6c80d88e2db310b12d24e70e4c5c3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Nov 2021 12:33:19 +0200 Subject: Remove insecure and dangerous relaxed auth mode --- docker/Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 3cc5f6a..1ca59be 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,13 +2,20 @@ # The container can be used for developing and testing # Purposes -FROM fedora:34 -RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver +FROM fedora:35 +RUN mkdir -p /etc/dserver /var/run/dserver/cache /var/log/dserver ADD ./dtail.json /etc/dserver/dtail.json +# TODO: Compile dserver in a container as well, as otherwise might have glibc +# errors. ADD ./dserver /usr/local/bin/dserver ADD ./mapr_testdata.log /var/log/mapr_testdata.log +# Normal Linux user (simulates someone who want's to use DTail) +RUN useradd fred +ADD ./id_rsa_docker.pub /var/run/dserver/cache/fred.authorized_keys + +# DTail server user RUN useradd dserver RUN chown -R dserver /var/run/dserver /var/log/dserver USER dserver @@ -16,4 +23,4 @@ USER dserver WORKDIR /var/run/dserver EXPOSE 2222/tcp -CMD ["/usr/local/bin/dserver", "-RELAXED_AUTH_I_AM_REALLY_SURE", "-cfg", "/etc/dserver/dtail.json"] +CMD ["/usr/local/bin/dserver", "-cfg", "/etc/dserver/dtail.json"] -- cgit v1.2.3 From 84dd50ac1f0b51cc55b14916c1646d13a3096af3 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 7 Nov 2021 11:35:44 +0200 Subject: Can configure num of docker server instances via NUM_INSTANCES --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 1ca59be..06b8f89 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,8 +12,8 @@ ADD ./dserver /usr/local/bin/dserver ADD ./mapr_testdata.log /var/log/mapr_testdata.log # Normal Linux user (simulates someone who want's to use DTail) -RUN useradd fred -ADD ./id_rsa_docker.pub /var/run/dserver/cache/fred.authorized_keys +RUN useradd paul +ADD ./id_rsa_docker.pub /var/run/dserver/cache/paul.authorized_keys # DTail server user RUN useradd dserver -- cgit v1.2.3 From 9c0a88d3f82f730fb3d19a0ffc9e85448bdc6216 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 3 Dec 2021 12:27:11 +0000 Subject: update TODO comments --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 06b8f89..c3b0092 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,8 +6,7 @@ FROM fedora:35 RUN mkdir -p /etc/dserver /var/run/dserver/cache /var/log/dserver ADD ./dtail.json /etc/dserver/dtail.json -# TODO: Compile dserver in a container as well, as otherwise might have glibc -# errors. +# NEXT: Compile dserver in a container as well, as otherwise might have glibc errors. ADD ./dserver /usr/local/bin/dserver ADD ./mapr_testdata.log /var/log/mapr_testdata.log -- cgit v1.2.3