rich/docker-compose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Rich
2024-03-26 12:51:43 +00:00
parent ad7f54ccf7
commit d7a391051e
2 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dante/Dockerfile
View File

@@ -1,5 +1,5 @@
FROM ubuntu FROM ubuntu
MAINTAINER rmj014@gmail.com LABEL org.opencontainers.image.authors="rmj014@gmail.com"
RUN apt-get update && apt-get -y upgrade \ RUN apt-get update && apt-get -y upgrade \
&& apt-get install -y iputils-ping curl net-tools iptables dante-server && apt-get install -y iputils-ping curl net-tools iptables dante-server
RUN apt-get install -y vim RUN apt-get install -y vim

88
docker-compose.yml
View File

@@ -382,50 +382,50 @@ services:
volumes: volumes:
- /srv/docker/mariadb:/config - /srv/docker/mariadb:/config
gitlab: # gitlab:
image: sameersbn/gitlab:16.6.0 # image: sameersbn/gitlab:16.6.0
container_name: gitlab # container_name: gitlab
environment: # environment:
- "USERMAP_UID=1000" # - "USERMAP_UID=1000"
- "USERMAP_GID=1000" # - "USERMAP_GID=1000"
- 'GITLAB_PORT=443' # - 'GITLAB_PORT=443'
- 'GITLAB_SSH_PORT=10022' # - 'GITLAB_SSH_PORT=10022'
- 'GITLAB_HTTPS=true' # - 'GITLAB_HTTPS=true'
- 'DB_NAME=gitlabhq_production' # - 'DB_NAME=gitlabhq_production'
- 'DB_HOST=postgres.swag' # - 'DB_HOST=postgres.swag'
- 'DB_USER=gitlab' # - 'DB_USER=gitlab'
- 'DB_PASS=${DDB_PASS}' # - 'DB_PASS=${DDB_PASS}'
- 'GITLAB_HOST=git.${DDOMAIN}' # - 'GITLAB_HOST=git.${DDOMAIN}'
- 'GITLAB_BACKUPS=daily' # - 'GITLAB_BACKUPS=daily'
- 'UNICORN_WORKERS=3' # - 'UNICORN_WORKERS=3'
- 'UNICORN_TIMEOUT=240' # - 'UNICORN_TIMEOUT=240'
- 'GITLAB_WEBHOOK_TIMEOUT=240' # - 'GITLAB_WEBHOOK_TIMEOUT=240'
- 'GITLAB_TIMEOUT=240' # - 'GITLAB_TIMEOUT=240'
- 'SMTP_OPENSSL_VERIFY_MODE=none' # - 'SMTP_OPENSSL_VERIFY_MODE=none'
- 'REDIS_HOST=redis.swag' # - 'REDIS_HOST=redis.swag'
- GITLAB_SECRETS_DB_KEY_BASE=${DGITLAB_SECRETS_DB_KEY_BASE} # - GITLAB_SECRETS_DB_KEY_BASE=${DGITLAB_SECRETS_DB_KEY_BASE}
- GITLAB_SECRETS_SECRET_KEY_BASE=${DGITLAB_SECRETS_SECRET_KEY_BASE} # - GITLAB_SECRETS_SECRET_KEY_BASE=${DGITLAB_SECRETS_SECRET_KEY_BASE}
- GITLAB_SECRETS_OTP_KEY_BASE=${DGITLAB_SECRETS_OTP_KEY_BASE} # - GITLAB_SECRETS_OTP_KEY_BASE=${DGITLAB_SECRETS_OTP_KEY_BASE}
# - SMTP_USER=${DSMTP_USER} # # - SMTP_USER=${DSMTP_USER}
# - SMTP_PASS=${DSMTP_PASS} # # - SMTP_PASS=${DSMTP_PASS}
# - IMAP_USER=${DSMTP_USER} # # - IMAP_USER=${DSMTP_USER}
# - IMAP_PASS=${DSMTP_PASS} # # - IMAP_PASS=${DSMTP_PASS}
# - GITLAB_INCOMING_EMAIL_ADDRESS=${DGITLAB_INCOMING_EMAIL_ADDRESS} # # - GITLAB_INCOMING_EMAIL_ADDRESS=${DGITLAB_INCOMING_EMAIL_ADDRESS}
restart: unless-stopped # restart: unless-stopped
depends_on: # depends_on:
- "swag" # - "swag"
- "postgres" # - "postgres"
- "redis" # - "redis"
networks: # networks:
- swag # - swag
ports: # ports:
- "10022:22" # - "10022:22"
- "10080:80" # - "10080:80"
volumes: # volumes:
- /var/run/docker.sock:/run/docker.sock # - /var/run/docker.sock:/run/docker.sock
- /usr/bin/docker:/bin/docker # - /usr/bin/docker:/bin/docker
- /srv/docker/gitlab/data:/home/git/data # - /srv/docker/gitlab/data:/home/git/data
- /etc/localtime:/etc/localtime:ro # - /etc/localtime:/etc/localtime:ro
netdata: netdata:
image: netdata/netdata image: netdata/netdata