From f3679d7bbd46505fdb12ad44d9b199e80ceca469 Mon Sep 17 00:00:00 2001 From: Stevo Dlugolinsky <stevo@dlugolinsky.com> Date: Thu, 10 Jan 2019 17:02:49 +0100 Subject: [PATCH 1/3] devops help --- Dockerfile-dev | 33 +++++++++++++++++++++++++++++++++ build-dev.sh | 1 + run-dev.sh | 7 +++++++ scripts/build-n-run-deepaas.sh | 9 +++++++++ 4 files changed, 50 insertions(+) create mode 100644 Dockerfile-dev create mode 100755 build-dev.sh create mode 100755 run-dev.sh create mode 100755 scripts/build-n-run-deepaas.sh diff --git a/Dockerfile-dev b/Dockerfile-dev new file mode 100644 index 0000000..2ef21c8 --- /dev/null +++ b/Dockerfile-dev @@ -0,0 +1,33 @@ +FROM ubuntu:18.04 + +RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ + apt-get install -y --no-install-recommends \ + git \ + curl \ + mc \ + wget \ + vim \ + ssh \ + netcat \ + python3 \ + python3-setuptools \ + python3-pip \ + python3-wheel && \ + curl https://downloads.rclone.org/rclone-current-linux-amd64.deb --output rclone-current-linux-amd64.deb && \ + dpkg -i rclone-current-linux-amd64.deb && \ + apt install -f && \ + rm rclone-current-linux-amd64.deb && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /root/.cache/pip/* && \ + rm -rf /tmp/* + +ENV LANG C.UTF-8 + +WORKDIR /srv + +COPY scripts/build-n-run-deepaas.sh build-n-run-deepaas.sh + +EXPOSE 5000 + +CMD tail -f /dev/null diff --git a/build-dev.sh b/build-dev.sh new file mode 100755 index 0000000..18bd6fb --- /dev/null +++ b/build-dev.sh @@ -0,0 +1 @@ +docker build -t deep-mods:dev -f Dockerfile-dev . \ No newline at end of file diff --git a/run-dev.sh b/run-dev.sh new file mode 100755 index 0000000..dfce42e --- /dev/null +++ b/run-dev.sh @@ -0,0 +1,7 @@ +#!/bin/bash +docker run -d\ + -p 5000:5000\ + -v /Users/stevo/workspaces/deep/workspace/CURRENT/volumes/root/.config/:/root/.config\ + -v /Users/stevo/workspaces/deep/workspace/CURRENT/deepaas/:/srv/deepaas\ + -v /Users/stevo/workspaces/deep/workspace/CURRENT/mods/:/srv/mods\ + --name deep-mods-dev deep-mods:dev diff --git a/scripts/build-n-run-deepaas.sh b/scripts/build-n-run-deepaas.sh new file mode 100755 index 0000000..cde28d6 --- /dev/null +++ b/scripts/build-n-run-deepaas.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# This is a helper script, which automatically installs mods and deepaas. After a successfull build, it executes deepaas. +cd mods/ && \ +pip3 install -e . && \ +cd .. && \ +cd deepaas/ && \ +pip3 install -U . && \ +cd .. && \ +deepaas-run --listen-ip 0.0.0.0 -- GitLab From 88facda125c54982223ea2ec31daef7f90ae9f77 Mon Sep 17 00:00:00 2001 From: Stevo Dlugolinsky <stefan.dlugolinsky@savba.sk> Date: Thu, 17 Jan 2019 15:43:08 +0100 Subject: [PATCH 2/3] migration from indigo-dc --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d22e0c4..bad1c7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ ENV LANG C.UTF-8 WORKDIR /srv # Install user app: -RUN git clone https://github.com/indigo-dc/mods.git && \ +RUN git clone https://github.com/deephdc/mods.git && \ cd mods && \ pip3 install --no-cache-dir -e . && \ rm -rf /root/.cache/pip3/* && \ -- GitLab From d3ddc78e1ac86275e947bff3e8a3a3403957a9fe Mon Sep 17 00:00:00 2001 From: Stevo Dlugolinsky <stefan.dlugolinsky@savba.sk> Date: Thu, 17 Jan 2019 16:49:21 +0100 Subject: [PATCH 3/3] migration --- build-dev.sh | 1 - run-dev.sh | 7 ------- 2 files changed, 8 deletions(-) delete mode 100755 build-dev.sh delete mode 100755 run-dev.sh diff --git a/build-dev.sh b/build-dev.sh deleted file mode 100755 index 18bd6fb..0000000 --- a/build-dev.sh +++ /dev/null @@ -1 +0,0 @@ -docker build -t deep-mods:dev -f Dockerfile-dev . \ No newline at end of file diff --git a/run-dev.sh b/run-dev.sh deleted file mode 100755 index dfce42e..0000000 --- a/run-dev.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -docker run -d\ - -p 5000:5000\ - -v /Users/stevo/workspaces/deep/workspace/CURRENT/volumes/root/.config/:/root/.config\ - -v /Users/stevo/workspaces/deep/workspace/CURRENT/deepaas/:/srv/deepaas\ - -v /Users/stevo/workspaces/deep/workspace/CURRENT/mods/:/srv/mods\ - --name deep-mods-dev deep-mods:dev -- GitLab