removed some old things and replaced the jenkins versions from registry with dynamic build
This commit is contained in:
@@ -1,39 +0,0 @@
|
|||||||
services:
|
|
||||||
cronicle_manager:
|
|
||||||
# image: cronicle/edge:latest
|
|
||||||
image: ghcr.io/cronicle-edge/cronicle-edge:main
|
|
||||||
restart: always
|
|
||||||
command: manager
|
|
||||||
hostname: julien
|
|
||||||
environment:
|
|
||||||
- CRONICLE_secret_key=secretKey
|
|
||||||
ports:
|
|
||||||
- 3012:3012
|
|
||||||
volumes:
|
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
|
||||||
- /docker_config/cronicle/data:/opt/cronicle/data
|
|
||||||
- /docker_config/cronicle/logs:/opt/cronicle/logs
|
|
||||||
- /docker_config/cronicle/plugins:/opt/cronicle/plugins
|
|
||||||
- /docker_config/cronicle/workloads/app:/app
|
|
||||||
- /docker_config/configs/:/configs
|
|
||||||
|
|
||||||
# healthchecks:
|
|
||||||
# image: healthchecks/healthchecks:latest
|
|
||||||
# container_name: healthchecks
|
|
||||||
# environment:
|
|
||||||
# - DB=sqlite
|
|
||||||
# - DB_NAME=/data/hc.sqlite
|
|
||||||
# - DEBUG=False
|
|
||||||
# - DEFAULT_FROM_EMAIL=fixme-email-address-here
|
|
||||||
# - EMAIL_HOST=fixme-smtp-host-here
|
|
||||||
# - EMAIL_HOST_PASSWORD=fixme-smtp-password-here
|
|
||||||
# - EMAIL_HOST_USER=fixme-smtp-username-here
|
|
||||||
# - EMAIL_PORT=587
|
|
||||||
# - EMAIL_USE_TLS=True
|
|
||||||
# - SECRET_KEY=---
|
|
||||||
# - SITE_ROOT=http://localhost:3013
|
|
||||||
# ports:
|
|
||||||
# - 3013:8000
|
|
||||||
# volumes:
|
|
||||||
# - /docker_config/healthchecks/:/data
|
|
||||||
# restart: unless-stopped
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
services:
|
|
||||||
duplicati:
|
|
||||||
image: lscr.io/linuxserver/duplicati:latest
|
|
||||||
container_name: duplicati
|
|
||||||
environment:
|
|
||||||
- PUID=0
|
|
||||||
- PGID=0
|
|
||||||
- TZ=Etc/UTC
|
|
||||||
- SETTINGS_ENCRYPTION_KEY=12345678
|
|
||||||
- CLI_ARGS= #optional
|
|
||||||
- DUPLICATI__WEBSERVICE_PASSWORD=password
|
|
||||||
volumes:
|
|
||||||
# - /path/to/duplicati/config:/config
|
|
||||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/duplicatitest:/backups
|
|
||||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config:/source
|
|
||||||
ports:
|
|
||||||
- 8200:8200
|
|
||||||
restart: unless-stopped
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
services:
|
||||||
|
imap-backup:
|
||||||
|
image: ghcr.io/joeyates/imap-backup:latest
|
||||||
|
volume:
|
||||||
|
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/mailbackup/config:/config
|
||||||
|
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/mailbackup/data:/data
|
||||||
|
config:
|
||||||
|
/config/imap-backup.json
|
||||||
@@ -2,14 +2,14 @@ services:
|
|||||||
jenkins:
|
jenkins:
|
||||||
container_name: jenkins
|
container_name: jenkins
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: registry.vbchaos.nl/jenkins-docker
|
build:
|
||||||
|
context: ./jenkins
|
||||||
user: root
|
user: root
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- /usr/bin/docker:/usr/bin/docker
|
- /usr/bin/docker:/usr/bin/docker
|
||||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/jenkins/:/var/jenkins_home
|
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/jenkins/:/var/jenkins_home
|
||||||
- /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/workspace:/var/jenkins_home/workspace
|
- /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/workspace:/var/jenkins_home/workspace
|
||||||
# - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/jobs:/var/jenkins_home/jobs
|
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
- "50000:50000"
|
- "50000:50000"
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
FROM jenkins/jenkins:lts
|
||||||
|
USER root
|
||||||
|
|
||||||
|
RUN apt-get update -qq \
|
||||||
|
&& apt-get install -qqy \
|
||||||
|
apt-transport-https \
|
||||||
|
ca-certificates \
|
||||||
|
curl \
|
||||||
|
gnupg2 \
|
||||||
|
# software-properties-common \
|
||||||
|
&& apt clean
|
||||||
|
|
||||||
|
RUN install -m 0755 -d /etc/apt/keyrings
|
||||||
|
|
||||||
|
RUN curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
|
||||||
|
RUN chmod a+r /etc/apt/keyrings/docker.asc
|
||||||
|
|
||||||
|
RUN echo \
|
||||||
|
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
|
||||||
|
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
|
||||||
|
tee /etc/apt/sources.list.d/docker.list > /dev/null
|
||||||
|
|
||||||
|
RUN apt-get update -qq \
|
||||||
|
&& apt-get -y install docker-ce docker-compose-plugin
|
||||||
|
RUN usermod -aG docker jenkins
|
||||||
|
|
||||||
|
|
||||||
@@ -2,15 +2,13 @@ services:
|
|||||||
jenkins:
|
jenkins:
|
||||||
container_name: jenkins
|
container_name: jenkins
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
build:
|
image: registry.vbchaos.nl/jenkins-docker
|
||||||
context: ./jenkins
|
|
||||||
user: root
|
user: root
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- /usr/bin/docker:/usr/bin/docker
|
- /usr/bin/docker:/usr/bin/docker
|
||||||
# - ./jenkins_home:/var/jenkins_home
|
|
||||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/jenkins/:/var/jenkins_home
|
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/jenkins/:/var/jenkins_home
|
||||||
# - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/workspace:/var/jenkins_home/workspace
|
- /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/workspace:/var/jenkins_home/workspace
|
||||||
# - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/jobs:/var/jenkins_home/jobs
|
# - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/jobs:/var/jenkins_home/jobs
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
@@ -7,7 +7,7 @@ services:
|
|||||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database:/var/lib/mysql:Z
|
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database:/var/lib/mysql:Z
|
||||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database.sock:/run/mysqld/mysqld.sock
|
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database.sock:/run/mysqld/mysqld.sock
|
||||||
- ./tmp_dir/database:/var/lib/mysql:Z
|
- ./tmp_dir/database:/var/lib/mysql:Z
|
||||||
- ./tmp_dir/database.sock:/run/mysqld/mysqld.sock
|
# - ./tmp_dir/database.sock:/run/mysqld/mysqld.sock
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=rootpw
|
- MYSQL_ROOT_PASSWORD=rootpw
|
||||||
- MYSQL_PASSWORD=password
|
- MYSQL_PASSWORD=password
|
||||||
|
|||||||
@@ -1,37 +1,19 @@
|
|||||||
version: '3'
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
registrystorage:
|
|
||||||
driver: local
|
|
||||||
driver_opts:
|
|
||||||
type: none
|
|
||||||
o: bind
|
|
||||||
device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry
|
|
||||||
registryauth:
|
|
||||||
driver: local
|
|
||||||
driver_opts:
|
|
||||||
type: none
|
|
||||||
o: bind
|
|
||||||
device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry/auth
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
registry:
|
registry:
|
||||||
image: registry:2
|
image: registry:2
|
||||||
volumes:
|
volumes:
|
||||||
- registryauth:/auth
|
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry/auth:/auth
|
||||||
- registrystorage:/var/lib/registry
|
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry:/var/lib/registry
|
||||||
environment:
|
environment:
|
||||||
- REGISTRY_STORAGE_DELETE_ENABLED=true
|
- REGISTRY_STORAGE_DELETE_ENABLED=true
|
||||||
- REGISTRY_AUTH=htpasswd
|
- REGISTRY_AUTH=htpasswd
|
||||||
- REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm
|
- REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm
|
||||||
- REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd
|
- REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd
|
||||||
- VIRTUAL_HOST=registry.vbchaos.nl
|
- VIRTUAL_HOST=registry.mitscherlich.nl
|
||||||
- VIRTUAL_PORT=5000
|
- VIRTUAL_PORT=5000
|
||||||
- VIRTUAL_PROTO=http
|
- VIRTUAL_PROTO=http
|
||||||
ports:
|
ports:
|
||||||
- '5000:5000'
|
- 5000:5000
|
||||||
|
|
||||||
registrybrowser:
|
registrybrowser:
|
||||||
image: klausmeyer/docker-registry-browser
|
image: klausmeyer/docker-registry-browser
|
||||||
@@ -40,7 +22,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
# - 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl'
|
# - 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl'
|
||||||
- 'DOCKER_REGISTRY_URL=http://10.10.1.32:5000'
|
- 'DOCKER_REGISTRY_URL=http://10.10.1.32:5000'
|
||||||
- 'PUBLIC_REGISTRY_URL=registry.vbchaos.nl'
|
- 'PUBLIC_REGISTRY_URL=registry.mitscherlich.nl'
|
||||||
- 'NO_SSL_VERIFICATION=true'
|
- 'NO_SSL_VERIFICATION=true'
|
||||||
- 'ENABLE_DELETE_IMAGES=true'
|
- 'ENABLE_DELETE_IMAGES=true'
|
||||||
- 'SECRET_KEY_BASE=69f08e9e10d29269e2dfa7f2b18eab49bd55e0c627a9d11cdab490b97a84bc46cb51e0210b7c20f9dc4ff52bcb789c1b9ca1c655ca37cc3bf94edd1fd180ef30'
|
- 'SECRET_KEY_BASE=69f08e9e10d29269e2dfa7f2b18eab49bd55e0c627a9d11cdab490b97a84bc46cb51e0210b7c20f9dc4ff52bcb789c1b9ca1c655ca37cc3bf94edd1fd180ef30'
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
version: "3"
|
|
||||||
|
|
||||||
services:
|
|
||||||
swag:
|
|
||||||
image: lscr.io/linuxserver/swag:latest
|
|
||||||
container_name: swag
|
|
||||||
cap_add:
|
|
||||||
- NET_ADMIN
|
|
||||||
environment:
|
|
||||||
- PUID=1000
|
|
||||||
- PGID=100
|
|
||||||
- TZ=Etc/UTC
|
|
||||||
- URL=vbchaos.nl
|
|
||||||
- VALIDATION=http
|
|
||||||
- SUBDOMAINS=nc,esp,git,grafana,registry,registrybrowser,svn,vpn,vaultwarden,collabora
|
|
||||||
- CERTPROVIDER= #optional
|
|
||||||
- DNSPLUGIN=cloudflare #optional
|
|
||||||
- PROPAGATION= #optional
|
|
||||||
- EMAIL= matthias.mitscherlich@gmail.com
|
|
||||||
- ONLY_SUBDOMAINS=false #optional
|
|
||||||
- EXTRA_DOMAINS= #optional
|
|
||||||
- STAGING=false #optional
|
|
||||||
volumes:
|
|
||||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/swag:/config
|
|
||||||
ports:
|
|
||||||
- 443:443
|
|
||||||
- 81:80 #optional
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user