liuyuqi-dellpc 8 months ago
parent
commit
e482ebb612

+ 0 - 3
docker/db/mongo-express/Dockerfile

@@ -1,3 +0,0 @@
-FROM mongo-express
-
-EXPOSE 8081

+ 0 - 31
docker/db/mongo-express/docker-compose.debug.yml

@@ -1,31 +0,0 @@
-version: '3.4'
-
-services:
-
-  mongo:
-    image: registry.cn-hangzhou.aliyuncs.com/kennylee/mongo-express
-    container_name: "mongo-express"
-    restart: always
-    # env_file: .env
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=root
-      - MONGO_INITDB_ROOT_PASSWORD=example
-    volumes:
-      - mongo-data:/data/db
-    networks:
-      - infisical-dev
-    ports:
-      - "27017:27017"
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '30m'
-        max-file: '1'
-
-volumes:
-  mongo-data:
-
-
-networks:
-  infisical-dev:
-    driver: bridge

+ 0 - 95
docker/db/mysql/docker-compose.debug.yml

@@ -1,95 +0,0 @@
-version: '3.4'
-
-services:
-
-  postgres:
-    # image: 'registry.cn-hangzhou.aliyuncs.com/kennylee/postgresql:12.4'
-    container_name: db_postgres
-    image: postgres:16.0
-    environment:
-      POSTGRES_DB: chat
-      POSTGRES_USER: root
-      POSTGRES_PASSWORD: root1234
-    ports:
-      - 5432:5432
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-    restart: unless-stopped
-    networks:
-      - app-network
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '12m'
-        max-file: '5'
-
-  mariadb:
-    container_name: mariadb_container
-    image: mariadb:10.3
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: root1234
-      MYSQL_DATABASE: chat
-      MYSQL_USER: lyq
-      MYSQL_PASSWORD: lyq121212
-    volumes:
-      - ./mariadb:/var/lib/mysql
-      # - ./dev/mariadb:/docker-entrypoint-initdb.d
-    networks:
-      - app-network
-
-  mysql:
-    container_name: mysql-container
-    # image: mysql:8.1.0
-    image: mysql:5.6
-    restart: unless-stopped
-    volumes:
-      - ./mysql:/var/lib/mysql
-      # - db_data:/var/lib/mysql
-    environment:
-      MYSQL_DATABASE: chat
-      MYSQL_USER: lyq
-      MYSQL_PASSWORD: lyq121212
-      MYSQL_ROOT_PASSWORD: root1234
-    ports:
-      - 3306:3306
-    networks:
-      - app-network
-
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    # image: phpmyadmin/phpmyadmin:5.2.1-fpm-alpine # has bug
-    ports:
-      - 8089:80
-    # restart: unless-stopped
-    environment:
-      PMA_HOST: mysql
-      # PMA_ARBITRARY: 1
-      MYSQL_ROOT_PASSWORD: root1234
-    depends_on:
-      - mysql
-    networks:
-      - app-network
-
-  adminer:
-    image: adminer:latest
-    ports:
-      - 8080:8080
-    environment:
-      ADMINER_DEFAULT_SERVER: mysql
-    depends_on:
-      - mysql
-      - postgres
-      - mariadb
-    networks:
-      - app-network
-
-volumes:
-  mariadb-data:
-  mysql-data:
-  postgres-data:
-
-
-networks:
-  app-network:
-    driver: bridge

+ 3 - 16
java/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 
 services:
-  githubactionscreator:
+  springboot:
     image: jianboy/springboot:latest
     build:
       context: .
@@ -11,19 +11,6 @@ services:
     volumes:
       - hostPath:containerPath:ro
 
-  mysql:
-    image: mysql:5.7
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: githubactionscreator
-    ports:
-      - 3306:3306
-
-  redis:
-    image: redis:latest
-    ports:
-      - 6379:6379
-    
   h2:
     container_name: MyH2Instance
     image: oscarfonts/h2:latest
@@ -39,7 +26,7 @@ services:
     image: adminer:latest
     ports:
       - 8080:8080
-  
+
   sqlserver:
     container_name: db_sqlserver
     # image: mcr.microsoft.com/mssql/server:2019-latest
@@ -54,4 +41,4 @@ services:
 networks:
   default:
     external:
-      name: githubactionscreator
+      name: githubactionscreator

+ 0 - 12
nodejs/docker-compose.debug.yml

@@ -26,15 +26,3 @@ services:
     networks:
       - infisical-dev
 
-  mongo:
-    image: mongo
-    container_name: infisical-dev-mongo
-    restart: always
-    env_file: .env
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=root
-      - MONGO_INITDB_ROOT_PASSWORD=example
-    volumes:
-      - mongo-data:/data/db
-    networks:
-      - infisical-dev

+ 101 - 6
php/deploy/docker-compose.debug.yml

@@ -19,6 +19,19 @@ services:
       - mysql
       - redis
 
+  adminer:
+    image: adminer:latest
+    ports:
+      - 8080:8080
+    environment:
+      ADMINER_DEFAULT_SERVER: mysql
+    depends_on:
+      - mysql
+      - postgres
+      - mariadb
+    networks:
+      - app-network
+
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:5.2.1-fpm-alpine
     ports:
@@ -26,12 +39,17 @@ services:
     restart: always
     environment:
       PMA_HOST: mysql
+      # PMA_ARBITRARY: 1
+      MYSQL_ROOT_PASSWORD: root1234
     depends_on:
       - mysql
+    networks:
+      - app-network
 
   mysql:
     container_name: mysql-container
     image: mysql:8.0
+    #     image: mysql:5.6
     restart: unless-stopped
     volumes:
       - ./mysql:/var/lib/mysql
@@ -45,6 +63,42 @@ services:
     networks:
       - app-network
 
+  postgres:
+    # image: 'registry.cn-hangzhou.aliyuncs.com/kennylee/postgresql:12.4'
+    container_name: db_postgres
+    image: postgres:16.0
+    environment:
+      POSTGRES_DB: chat
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: root1234
+    ports:
+      - 5432:5432
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    restart: unless-stopped
+    networks:
+      - app-network
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '12m'
+        max-file: '5'
+
+  mariadb:
+    container_name: mariadb_container
+    image: mariadb:10.3
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: root1234
+      MYSQL_DATABASE: chat
+      MYSQL_USER: lyq
+      MYSQL_PASSWORD: lyq121212
+    volumes:
+      - ./mariadb:/var/lib/mysql
+      # - ./dev/mariadb:/docker-entrypoint-initdb.d
+    networks:
+      - app-network
+
   redis:
     image: redis:7.2.3
     container_name: redis-container
@@ -77,10 +131,51 @@ services:
     networks:
       - infisical-dev
 
-  volumes:
-    mysql:
-    redis:
+  mongo:
+    container_name: infisical-mongo
+    image: mongo:latest
+    #     image: mongo:7.0.5-rc0
+    #     image: registry.cn-hangzhou.aliyuncs.com/kennylee/mongo-express
+    restart: always
+    env_file: .env
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=${MONGO_USERNAME}
+      - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD}
+    volumes:
+      - mongo-data:/data/db
+    networks:
+      - infisical
+    ports:
+      - "27017:27017"
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '30m'
+        max-file: '1'
+
+  mongo-express:
+    container_name: infisical-dev-mongo-express
+    image: mongo-express
+    restart: always
+    depends_on:
+      - mongo
+    env_file: .env
+    environment:
+      - ME_CONFIG_MONGODB_ADMINUSERNAME=root
+      - ME_CONFIG_MONGODB_ADMINPASSWORD=example
+      - ME_CONFIG_MONGODB_URL=mongodb://root:example@mongo:27017/
+    ports:
+      - 8081:8081
+    networks:
+      - infisical-dev
+
+volumes:
+  mariadb-data:
+  mysql-data:
+  postgres-data:
+  mongo-data:
+    driver: local
 
-  networks:
-    app-network:
-      driver: bridge
+networks:
+  app-network:
+    driver: bridge

+ 0 - 3
php/php74xc/docker-compose.yml

@@ -3,9 +3,6 @@ services:
 
   php:
     container_name: "php-fpm"
-    # depends_on:
-    #   - redis
-    #   - mysql
     build:
       context: ./
       dockerfile: ./Dockerfile

+ 0 - 3
php/php8xc/docker-compose.yml

@@ -3,9 +3,6 @@ services:
 
   php:
     container_name: "php-fpm"
-    # depends_on:
-    #   - redis
-    #   - mysql
     build:
       context: ./
       dockerfile: ./Dockerfile

+ 0 - 37
python/deploy/docker-compose.dev.yml

@@ -59,18 +59,6 @@ services:
     networks:
       - infisical-dev
 
-  mongo:
-    image: mongo:7.0.5-rc0
-    container_name: infisical-dev-mongo
-    restart: always
-    env_file: .env
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=root
-      - MONGO_INITDB_ROOT_PASSWORD=example
-    volumes:
-      - mongo-data:/data/db
-    networks:
-      - infisical-dev
 
   mongo-express:
     container_name: infisical-dev-mongo-express
@@ -100,31 +88,6 @@ services:
     networks:
       - infisical-dev
 
-  redis:
-    image: redis:7.2.3
-    container_name: infisical-dev-redis
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-    ports:
-      - 6379:6379
-    volumes:
-        - redis_data:/data
-    networks:
-      - infisical-dev
-
-  redis-commander:
-    container_name: infisical-dev-redis-commander
-    image: rediscommander/redis-commander:latest
-    restart: always
-    depends_on:
-      - redis
-    environment:
-      - REDIS_HOSTS=local:redis:6379
-    ports:
-      - "8085:8081"
-    networks:
-      - infisical-dev
-
 volumes:
   mongo-data:
     driver: local

+ 0 - 30
python/docker-compose.yml

@@ -42,37 +42,7 @@ services:
     networks:
       - infisical
 
-  redis:
-    image: redis
-    container_name: infisical-dev-redis
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-    ports:
-      - 6379:6379
-    networks:
-      - infisical
-    volumes:
-      - redis_data:/data
 
-  mongo:
-    container_name: infisical-mongo
-    image: mongo:latest
-    restart: always
-    env_file: .env
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=${MONGO_USERNAME}
-      - MONGO_INITDB_ROOT_PASSWORD=${MONGO_PASSWORD}
-    volumes:
-      - mongo-data:/data/db
-    networks:
-      - infisical
-    ports:
-      - "27017:27017"
-    logging:
-        driver: 'json-file'
-        options:
-            max-size: '30m'
-            max-file: '1'
             
 volumes:
   mongo-data: