From 383e52793a6cc34edf45a7ee848bcb0857f944ae Mon Sep 17 00:00:00 2001 From: dcore94 Date: Fri, 8 Mar 2024 16:48:51 +0100 Subject: [PATCH] removed obsolete code --- build-base.sh | 10 ---------- build-provisioning.sh | 10 ---------- config-nw-docker-cluster.cfg | 13 ------------- docker/base/Dockerfile | 8 -------- docker/base/entrypoint.sh | 14 -------------- docker/base/requirements.txt | 2 -- docker/provisioning/Dockerfile | 8 -------- docker/provisioning/entrypoint.sh | 14 -------------- docker/provisioning/requirements.txt | 1 - 9 files changed, 80 deletions(-) delete mode 100755 build-base.sh delete mode 100755 build-provisioning.sh delete mode 100644 config-nw-docker-cluster.cfg delete mode 100644 docker/base/Dockerfile delete mode 100755 docker/base/entrypoint.sh delete mode 100644 docker/base/requirements.txt delete mode 100644 docker/provisioning/Dockerfile delete mode 100755 docker/provisioning/entrypoint.sh delete mode 100644 docker/provisioning/requirements.txt diff --git a/build-base.sh b/build-base.sh deleted file mode 100755 index c4b494d..0000000 --- a/build-base.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -if [ $# -eq 0 ] - then - tag='latest' - else - tag=$1 -fi - -docker build -t nubisware/nubisware-conductor-worker-py-base:$tag -f docker/base/Dockerfile . -docker push nubisware/nubisware-conductor-worker-py-base:$tag diff --git a/build-provisioning.sh b/build-provisioning.sh deleted file mode 100755 index 10f8c50..0000000 --- a/build-provisioning.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -if [ $# -eq 0 ] - then - tag='latest' - else - tag=$1 -fi - -docker build -t nubisware/nubisware-conductor-worker-py-provisioning:$tag -f docker/provisioning/Dockerfile . -docker push nubisware/nubisware-conductor-worker-py-provisioning:$tag diff --git a/config-nw-docker-cluster.cfg b/config-nw-docker-cluster.cfg deleted file mode 100644 index 8aae7f4..0000000 --- a/config-nw-docker-cluster.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[common] -loglevel = debug -server = http://conductor-dev.int.d4science.net/api -#server = https://conductor.pre.d4science.org/api -#server = http://localhost:8080/api -threads = 1 -pollrate = 1 - -[pyansible] -domain=nw-cluster-docker - -[pypacker] -domain=nw-cluster-docker diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile deleted file mode 100644 index 573cccb..0000000 --- a/docker/base/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM python:3.7 -COPY ./docker/base/requirements.txt /app/ -RUN pip install -r /app/requirements.txt -COPY conductor/ /app/conductor -COPY pyexecplugins/ /app/pyexecplugins -COPY ./docker/base/requirements.txt PyExec.py config.cfg ./docker/base/entrypoint.sh /app/ -WORKDIR /app -ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/docker/base/entrypoint.sh b/docker/base/entrypoint.sh deleted file mode 100755 index 29c66ba..0000000 --- a/docker/base/entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -export HEALTH=${CONDUCTOR_HEALTH:-http://conductor-server:8080/health} - -echo 'Waiting for Conductor at ' $HEALTH '...' - -while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $HEALTH)" != 200 ]]; do - echo 'still waiting ...' - sleep 5 -done - -echo 'Starting default workers...' - -python3 PyExec.py Http Shell Eval Mail HttpBridge diff --git a/docker/base/requirements.txt b/docker/base/requirements.txt deleted file mode 100644 index a3751e6..0000000 --- a/docker/base/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -requests >= 2.19.1 - diff --git a/docker/provisioning/Dockerfile b/docker/provisioning/Dockerfile deleted file mode 100644 index fc88bfd..0000000 --- a/docker/provisioning/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM nubisware/nubisware-conductor-worker-py-base:latest -COPY ./docker/provisioning/requirements.txt /app/ -RUN pip install -r /app/requirements.txt -RUN apt-get update -RUN apt-get -y install packer -WORKDIR /app -COPY ./docker/provisioning/entrypoint.sh /app/ -ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/docker/provisioning/entrypoint.sh b/docker/provisioning/entrypoint.sh deleted file mode 100755 index e8449ea..0000000 --- a/docker/provisioning/entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -export HEALTH=${CONDUCTOR_HEALTH:-http://conductor-server:8080/health} - -echo 'Waiting for Conductor at ' $HEALTH ' ...' - -while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $HEALTH)" != 200 ]]; do - echo 'still waiting ...' - sleep 5 -done - -echo 'Starting provisioning workers...' - -python3 PyExec.py Ansible Packer diff --git a/docker/provisioning/requirements.txt b/docker/provisioning/requirements.txt deleted file mode 100644 index 75f651c..0000000 --- a/docker/provisioning/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ansible >= 2.8