Merge pull request #1 from notthinkingtinker/main

This commit is contained in:
oneMarcFifty 2022-09-29 11:38:09 +02:00 committed by GitHub
commit 49b33a8eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions

View File

@ -16,7 +16,7 @@ RUN apt-get -y update && \
git \ git \
nmap \ nmap \
sshpass sshpass
RUN apt-get clean
# let's install ansible using pip as root # let's install ansible using pip as root
# this will give a fat red warning at runtime but is intended this way. # this will give a fat red warning at runtime but is intended this way.
RUN pip install --upgrade pip RUN pip install --upgrade pip
@ -26,7 +26,7 @@ RUN pip install ansible
# and install it with apt # and install it with apt
RUN wget https://github.com/coder/code-server/releases/download/v4.6.0/code-server_4.6.0_amd64.deb RUN wget https://github.com/coder/code-server/releases/download/v4.6.0/code-server_4.6.0_amd64.deb
RUN apt -y install ./code-server_4.6.0_amd64.deb RUN apt -y install ./code-server_4.6.0_amd64.deb
RUN apt-get clean
# for compatibility with the non-docker version we just link the # for compatibility with the non-docker version we just link the
# /var/lib/rundeck directory to the /home/rundeck directory # /var/lib/rundeck directory to the /home/rundeck directory
RUN ln -s /home/rundeck /var/lib/rundeck RUN ln -s /home/rundeck /var/lib/rundeck

View File

@ -8,6 +8,7 @@ services:
build: build:
context: . context: .
container_name: rundeck container_name: rundeck
hostname: rundeck
restart: on-failure:5 restart: on-failure:5
links: links:
- mariadb - mariadb
@ -20,6 +21,8 @@ services:
- 8080:8080 - 8080:8080
volumes: volumes:
- ansible-data:/home/rundeck/ansible - ansible-data:/home/rundeck/ansible
networks:
- db-net
mariadb: mariadb:
image: mariadb:10.5.8 image: mariadb:10.5.8
container_name: mariadb container_name: mariadb
@ -28,6 +31,10 @@ services:
.env .env
volumes: volumes:
- mariadb-data:/var/lib/mysql - mariadb-data:/var/lib/mysql
networks:
- db-net
volumes: volumes:
mariadb-data: mariadb-data:
ansible-data: ansible-data:
networks:
db-net: