Pārlūkot izejas kodu

Remove redundant custom images for docker/ directory

tyranron 4 gadi atpakaļ
vecāks
revīzija
5492903825

+ 13 - 10
docker/docker-compose-all.yml

@@ -3,10 +3,11 @@ services:
 
 # MySQL mariadb
   mysql:
-    build:
-      context: ./mysql
+    image: mariadb
     restart: unless-stopped
     volumes:
+      - ./mysql/init-coturn-db.sql:/docker-entrypoint-initdb.d/init-coturn-db.sql:ro
+      - ./mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
       - mysql-data:/var/lib/mysql
     env_file: 
       - mysql/mysql.env
@@ -15,10 +16,10 @@ services:
 
 # PostgreSQL
   postgresql:
-    build:
-      context: ./postgresql
+    image: postgres
     restart: unless-stopped
     volumes:
+      - ./postgresql/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
       - postgresql-data:/var/lib/postgresql
     env_file: 
       - postgresql/postgresql.env
@@ -27,10 +28,11 @@ services:
 
 # Redis
   redis:
-    build:
-      context: ./redis
+    image: redis
     restart: unless-stopped
+    command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
     volumes:
+      - ./redis/redis.conf:/usr/local/etc/redis/redis.conf:ro
       - redis-data:/data
     env_file: 
       - redis/redis.env
@@ -52,12 +54,13 @@ services:
 # Coturn
   coturn:
     build:
-      context: ./coturn
+      context: ../
+      dockerfile: ./docker/coturn/debian/Dockerfile
     restart: always
     volumes:
-      - ${PWD}/coturn/turnserver.conf:/etc/turnserver.conf
-      - ${PWD}/coturn/privkey.pem:/etc/ssl/private/privkey.pem
-      - ${PWD}/coturn/cert.pem:/etc/ssl/certs/cert.pem
+      - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
+      - ./coturn/privkey.pem:/etc/ssl/private/privkey.pem:ro
+      - ./coturn/cert.pem:/etc/ssl/certs/cert.pem:ro
     ports:
 ## STUN/TURN
       - "3478:3478"

+ 5 - 4
docker/docker-compose-mongodb.yml

@@ -16,12 +16,13 @@ services:
 # Coturn
   coturn:
     build:
-      context: ./coturn
+      context: ../
+      dockerfile: ./docker/coturn/debian/Dockerfile
     restart: always
     volumes:
-      - ${PWD}/coturn/turnserver.conf:/etc/turnserver.conf
-      - ${PWD}/coturn/privkey.pem:/etc/ssl/private/privkey.pem
-      - ${PWD}/coturn/cert.pem:/etc/ssl/certs/cert.pem
+      - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
+      - ./coturn/privkey.pem:/etc/ssl/private/privkey.pem:ro
+      - ./coturn/cert.pem:/etc/ssl/certs/cert.pem:ro
     ports:
 ## STUN/TURN
       - "3478:3478"

+ 8 - 6
docker/docker-compose-mysql.yml

@@ -3,10 +3,11 @@ services:
 
 # MySQL mariadb
   mysql:
-    build:
-      context: ./mysql
+    image: mariadb
     restart: unless-stopped
     volumes:
+      - ./mysql/init-coturn-db.sql:/docker-entrypoint-initdb.d/init-coturn-db.sql:ro
+      - ./mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
       - mysql-data:/var/lib/mysql/data
     env_file: 
       - mysql/mysql.env
@@ -17,12 +18,13 @@ services:
 # Coturn
   coturn:
     build:
-      context: ./coturn
+      context: ../
+      dockerfile: ./docker/coturn/debian/Dockerfile
     restart: always
     volumes:
-      - ${PWD}/coturn/turnserver.conf:/etc/turnserver.conf
-      - ${PWD}/coturn/privkey.pem:/etc/ssl/private/privkey.pem
-      - ${PWD}/coturn/cert.pem:/etc/ssl/certs/cert.pem
+      - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
+      - ./coturn/privkey.pem:/etc/ssl/private/privkey.pem:ro
+      - ./coturn/cert.pem:/etc/ssl/certs/cert.pem:ro
     ports:
 ## STUN/TURN
       - "3478:3478"

+ 7 - 6
docker/docker-compose-postgresql.yml

@@ -3,10 +3,10 @@ services:
 
 # PostgreSQL
   postgresql:
-    build:
-      context: ./postgresql
+    image: postgres
     restart: unless-stopped
     volumes:
+      - ./postgresql/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
       - postgresql-data:/var/lib/postgresql/data
     env_file: 
       - postgresql/postgresql.env
@@ -17,12 +17,13 @@ services:
 # Coturn
   coturn:
     build:
-      context: ./coturn
+      context: ../
+      dockerfile: ./docker/coturn/debian/Dockerfile
     restart: always
     volumes:
-      - ${PWD}/coturn/turnserver.conf:/etc/turnserver.conf
-      - ${PWD}/coturn/privkey.pem:/etc/ssl/private/privkey.pem
-      - ${PWD}/coturn/cert.pem:/etc/ssl/certs/cert.pem
+      - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
+      - ./coturn/privkey.pem:/etc/ssl/private/privkey.pem:ro
+      - ./coturn/cert.pem:/etc/ssl/certs/cert.pem:ro
     ports:
 ## STUN/TURN
       - "3478:3478"

+ 8 - 6
docker/docker-compose-redis.yml

@@ -3,10 +3,11 @@ services:
 
 # Redis
   redis:
-    build:
-      context: ./redis
+    image: redis
     restart: unless-stopped
+    command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
     volumes:
+      - ./redis/redis.conf:/usr/local/etc/redis/redis.conf:ro
       - redis-data:/data
     env_file: 
       - redis/redis.env
@@ -17,12 +18,13 @@ services:
 # Coturn
   coturn:
     build:
-      context: ./coturn
+      context: ../
+      dockerfile: ./docker/coturn/debian/Dockerfile
     restart: always
     volumes:
-      - ${PWD}/coturn/turnserver.conf:/etc/turnserver.conf
-      - ${PWD}/coturn/privkey.pem:/etc/ssl/private/privkey.pem
-      - ${PWD}/coturn/cert.pem:/etc/ssl/certs/cert.pem
+      - ./coturn/turnserver.conf:/etc/turnserver.conf:ro
+      - ./coturn/privkey.pem:/etc/ssl/private/privkey.pem:ro
+      - ./coturn/cert.pem:/etc/ssl/certs/cert.pem:ro
     ports:
 ## STUN/TURN
       - "3478:3478"

+ 0 - 6
docker/mysql/Dockerfile

@@ -1,6 +0,0 @@
-### init db with coturn schema
-FROM mariadb
-
-ADD init-coturn-db.sql /docker-entrypoint-initdb.d
-
-ADD schema.sql /docker-entrypoint-initdb.d

+ 0 - 4
docker/postgresql/Dockerfile

@@ -1,4 +0,0 @@
-### init db with coturn schema
-FROM postgres
-
-ADD schema.sql /docker-entrypoint-initdb.d

+ 0 - 6
docker/redis/Dockerfile

@@ -1,6 +0,0 @@
-### init db with coturn schema
-FROM redis
-
-COPY redis.conf /usr/local/etc/redis/redis.conf
-CMD [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
-