Browse Source

Merge branch 'docker' into 'devel'

Updated docker version tags

See merge request cyber5k/mistborn!88
merge-requests/88/merge
Felix G 5 years ago
parent
commit
dcc7abc1ea
  1. 6
      base.yml
  2. 2
      compose/production/postgres/Dockerfile
  3. 2
      compose/production/tor/Dockerfile
  4. 2
      compose/production/traefik/Dockerfile
  5. 2
      extra/bitwarden.yml
  6. 2
      extra/elasticsearch.yml
  7. 4
      extra/guacamole.yml
  8. 4
      extra/rocketchat.yml
  9. 2
      extra/syncthing.yml
  10. 4
      extra/wazuh.yml

6
base.yml

@ -51,7 +51,7 @@ services: @@ -51,7 +51,7 @@ services:
# context: .
# dockerfile: ./compose/production/traefik/Dockerfile
#image: mistborn_production_traefik
image: traefik:v2.2
image: traefik:v2.4.9
container_name: mistborn_production_traefik
depends_on:
- django
@ -85,7 +85,7 @@ services: @@ -85,7 +85,7 @@ services:
restart: unless-stopped
redis:
image: redis:5.0
image: redis:6.2-alpine
container_name: mistborn_production_redis
restart: unless-stopped
@ -158,7 +158,7 @@ services: @@ -158,7 +158,7 @@ services:
pihole:
container_name: mistborn_production_pihole
image: pihole/pihole:v5.7
image: pihole/pihole:v5.8
env_file:
- ./.envs/.production/.pihole
ports:

2
compose/production/postgres/Dockerfile

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
FROM postgres:11.3
FROM postgres:13.3-alpine
COPY ./compose/production/postgres/maintenance /usr/local/bin/maintenance
RUN chmod +x /usr/local/bin/maintenance/*

2
compose/production/tor/Dockerfile

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
FROM alpine:latest
FROM alpine:3.14.0
RUN apk update \
&& apk upgrade \

2
compose/production/traefik/Dockerfile

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
FROM traefik:v2.2
FROM traefik:v2.4.9
RUN mkdir -p /etc/traefik/acme
RUN touch /etc/traefik/acme/acme.json
RUN chmod 600 /etc/traefik/acme/acme.json

2
extra/bitwarden.yml

@ -2,7 +2,7 @@ version: '3' @@ -2,7 +2,7 @@ version: '3'
services:
bitwarden:
image: bitwardenrs/server:latest
image: vaultwarden/server:latest
container_name: mistborn_production_bitwarden
env_file:
- ../.envs/.production/.bitwarden

2
extra/elasticsearch.yml

@ -3,7 +3,7 @@ version: '3.7' @@ -3,7 +3,7 @@ version: '3.7'
services:
elasticsearch:
image: amazon/opendistro-for-elasticsearch:1.12.0
image: amazon/opendistro-for-elasticsearch:1.13.2
hostname: elasticsearch
restart: unless-stopped
ports:

4
extra/guacamole.yml

@ -5,7 +5,7 @@ services: @@ -5,7 +5,7 @@ services:
# guacd
guacd:
container_name: mistborn_production_guacd
image: guacamole/guacd
image: guacamole/guacd:latest
networks:
guacnetwork:
restart: unless-stopped
@ -53,7 +53,7 @@ services: @@ -53,7 +53,7 @@ services:
#GUACAMOLE_HOME: /config
env_file:
- ../.envs/.production/.guacamole
image: guacamole/guacamole
image: guacamole/guacamole:latest
links:
- guacd
networks:

4
extra/rocketchat.yml

@ -31,7 +31,7 @@ services: @@ -31,7 +31,7 @@ services:
# - 3000:3000
mongo:
image: mongo:4.0
image: mongo:4.4.6
container_name: mistborn_production_rocketchat_mongo
restart: unless-stopped
volumes:
@ -42,7 +42,7 @@ services: @@ -42,7 +42,7 @@ services:
# this container's job is just run the command to initialize the replica set.
# it will run the command and remove himself (it will not stay running)
mongo-init-replica:
image: mongo
image: mongo:4.4.6
command: 'bash -c "for i in `seq 1 30`; do mongo mongo/rocketchat --eval \"rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})\" && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 secs...\"; sleep 5; done; (exit $$s)"'
depends_on:
- mongo

2
extra/syncthing.yml

@ -2,7 +2,7 @@ version: '3' @@ -2,7 +2,7 @@ version: '3'
services:
syncthing:
image: linuxserver/syncthing
image: linuxserver/syncthing:latest
container_name: mistborn_production_syncthing
environment:
- PUID=1000

4
extra/wazuh.yml

@ -3,7 +3,7 @@ version: '3.7' @@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh:
image: wazuh/wazuh-odfe:4.1.2
image: wazuh/wazuh-odfe:4.1.5
hostname: wazuh-manager
restart: unless-stopped
ports:
@ -29,7 +29,7 @@ services: @@ -29,7 +29,7 @@ services:
- filebeat_var:/var/lib/filebeat
wazuh-kibana:
image: wazuh/wazuh-kibana-odfe:4.1.2
image: wazuh/wazuh-kibana-odfe:4.1.5
hostname: wazuh-kibana
restart: unless-stopped
labels:

Loading…
Cancel
Save