chore: add Yq

This commit is contained in:
2024-03-20 15:30:53 +01:00
parent 0edf55b049
commit 475605b9ae
3 changed files with 13 additions and 3 deletions

View File

@@ -12,6 +12,7 @@ DevOps Portable toolkit
- helm - helm
- kustomize - kustomize
- jq - jq
- yq
- k6 - k6
- s3fs - s3fs
@@ -21,7 +22,6 @@ services:
toolkit: toolkit:
image: jkaninda/toolkit:latest image: jkaninda/toolkit:latest
container_name: toolkit container_name: toolkit
command: ["/bin/bash", "sh"]
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ~/.kube:/root/.kube - ~/.kube:/root/.kube
@@ -40,7 +40,6 @@ services:
privileged: true privileged: true
devices: devices:
- "/dev/fuse" - "/dev/fuse"
command: ["/bin/bash", "sh"]
volumes: volumes:
- ./custome-volume:/custome-volume - ./custome-volume:/custome-volume
environment: environment:

View File

@@ -7,12 +7,14 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV VERSION="0.1" ENV VERSION="0.1"
ARG TEMP_DIR=/temp ARG TEMP_DIR=/temp
RUN apt-get update -qq \ 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 -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
RUN curl https://get.docker.com/ > dockerinstall && chmod 777 dockerinstall && ./dockerinstall 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 # Clear cache
RUN apt-get clean && rm -rf /var/lib/apt/lists/* 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/s3-mount.sh /usr/local/bin/s3-mount
RUN ln -s /usr/local/bin/backup.sh /usr/local/bin/backup RUN ln -s /usr/local/bin/backup.sh /usr/local/bin/backup
ADD src/supervisord.conf /etc/supervisor/supervisord.conf
CMD ["/usr/bin/supervisord"]

5
src/supervisord.conf Normal file
View File

@@ -0,0 +1,5 @@
[supervisord]
nodaemon=true
user=root
logfile=/var/log/supervisor/supervisord.log
pidfile=/var/run/supervisord.pid