diff --git a/README.md b/README.md index a413076..6c8424b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ DevOps Portable toolkit - helm - kustomize - jq +- yq - k6 - s3fs @@ -21,7 +22,6 @@ services: toolkit: image: jkaninda/toolkit:latest container_name: toolkit - command: ["/bin/bash", "sh"] volumes: - /var/run/docker.sock:/var/run/docker.sock - ~/.kube:/root/.kube @@ -40,7 +40,6 @@ services: privileged: true devices: - "/dev/fuse" - command: ["/bin/bash", "sh"] volumes: - ./custome-volume:/custome-volume environment: diff --git a/src/Dockerfile b/src/Dockerfile index cc48c21..7ae52a1 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -7,12 +7,14 @@ ARG DEBIAN_FRONTEND=noninteractive ENV VERSION="0.1" ARG TEMP_DIR=/temp RUN apt-get update -qq \ - && apt-get install -qqy apt-transport-https ca-certificates curl gnupg2 software-properties-common jq git build-essential libcurl4-openssl-dev libxml2-dev mime-support s3fs -y + && apt-get install -qqy apt-transport-https ca-certificates curl gnupg2 software-properties-common jq git wget supervisor build-essential libcurl4-openssl-dev libxml2-dev mime-support s3fs -y RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - RUN curl https://get.docker.com/ > dockerinstall && chmod 777 dockerinstall && ./dockerinstall +RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && chmod +x /usr/bin/yq + # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* @@ -44,3 +46,7 @@ RUN chmod +x /usr/local/bin/s3-mount.sh RUN ln -s /usr/local/bin/s3-mount.sh /usr/local/bin/s3-mount RUN ln -s /usr/local/bin/backup.sh /usr/local/bin/backup + +ADD src/supervisord.conf /etc/supervisor/supervisord.conf + +CMD ["/usr/bin/supervisord"] \ No newline at end of file diff --git a/src/supervisord.conf b/src/supervisord.conf new file mode 100644 index 0000000..c736060 --- /dev/null +++ b/src/supervisord.conf @@ -0,0 +1,5 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid \ No newline at end of file