From 0d4473c7d602ed76e40947f5fe1c06a9c49b6300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Sat, 14 Oct 2023 10:01:47 +0800 Subject: [PATCH 01/12] edit --- linux/docker-compose/mysql/5.7.25/docker-compose.yaml | 4 ++-- linux/docker-compose/mysql/8.0.24/docker-compose.yaml | 4 ++-- linux/docker-compose/redis/6.0/config/redis.conf | 2 +- linux/docker-compose/redis/6.0/docker-compose.yml | 2 +- linux/docker-compose/redis/latest/config/redis.conf | 2 +- linux/docker-compose/redis/latest/docker-compose.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/docker-compose/mysql/5.7.25/docker-compose.yaml b/linux/docker-compose/mysql/5.7.25/docker-compose.yaml index c68d29b..56a5ac7 100644 --- a/linux/docker-compose/mysql/5.7.25/docker-compose.yaml +++ b/linux/docker-compose/mysql/5.7.25/docker-compose.yaml @@ -5,11 +5,11 @@ services: container_name: mysql restart: unless-stopped environment: - MYSQL_ROOT_PASSWORD: yFu84VM6iP1VhdtU9xvIyuvKNatg4PKj + MYSQL_ROOT_PASSWORD: yFu84VM6iP1VhdtU9xvIggvKNatg4PKj TZ: Asia/Shanghai LANG: en_US.UTF-8 ports: - - "3306:3306" + - "23306:3306" volumes: - ./config/my.cnf:/etc/mysql/my.cnf - ./data:/var/lib/mysql diff --git a/linux/docker-compose/mysql/8.0.24/docker-compose.yaml b/linux/docker-compose/mysql/8.0.24/docker-compose.yaml index 96e586e..9a4563c 100644 --- a/linux/docker-compose/mysql/8.0.24/docker-compose.yaml +++ b/linux/docker-compose/mysql/8.0.24/docker-compose.yaml @@ -5,11 +5,11 @@ services: container_name: mysql restart: unless-stopped environment: - MYSQL_ROOT_PASSWORD: yFu84VM6iP1VhdtU9xvIyuvKNatg4PKj + MYSQL_ROOT_PASSWORD: yFu84VM6iPKKhdtU9xvIyuvKNatg4PKj TZ: Asia/Shanghai LANG: en_US.UTF-8 ports: - - "3306:3306" + - "23306:3306" volumes: - ./conf.d:/etc/mysql/conf.d - ./data:/var/lib/mysql diff --git a/linux/docker-compose/redis/6.0/config/redis.conf b/linux/docker-compose/redis/6.0/config/redis.conf index 0c930a7..1916c3c 100644 --- a/linux/docker-compose/redis/6.0/config/redis.conf +++ b/linux/docker-compose/redis/6.0/config/redis.conf @@ -1,2 +1,2 @@ -requirepass 123456 +requirepass 4R5egcRbnLLsV4i2nnAFbYWKawj5r4MC appendonly yes diff --git a/linux/docker-compose/redis/6.0/docker-compose.yml b/linux/docker-compose/redis/6.0/docker-compose.yml index 681d998..360e735 100644 --- a/linux/docker-compose/redis/6.0/docker-compose.yml +++ b/linux/docker-compose/redis/6.0/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped command: redis-server /etc/redis/redis.conf ports: - - "6379:6379" + - "26379:6379" volumes: - /etc/localtime:/etc/localtime:ro - ./config/redis.conf:/etc/redis/redis.conf # redis.conf文件内容 http://download.redis.io/redis-stable/redis.conf diff --git a/linux/docker-compose/redis/latest/config/redis.conf b/linux/docker-compose/redis/latest/config/redis.conf index 0c930a7..13d6e8f 100644 --- a/linux/docker-compose/redis/latest/config/redis.conf +++ b/linux/docker-compose/redis/latest/config/redis.conf @@ -1,2 +1,2 @@ -requirepass 123456 +requirepass 4R5egcRbnHtsV4iJJnAFbYWKawj5r4MC appendonly yes diff --git a/linux/docker-compose/redis/latest/docker-compose.yml b/linux/docker-compose/redis/latest/docker-compose.yml index ade8afb..e78ad81 100644 --- a/linux/docker-compose/redis/latest/docker-compose.yml +++ b/linux/docker-compose/redis/latest/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped command: redis-server /etc/redis/redis.conf ports: - - "6379:6379" + - "26379:6379" volumes: - /etc/localtime:/etc/localtime:ro - ./config/redis.conf:/etc/redis/redis.conf # redis.conf文件内容 http://download.redis.io/redis-stable/redis.conf -- Gitee From f1160b8236fb94723da758f5ace7d6189df9599a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:34:55 +0800 Subject: [PATCH 02/12] Changes --- {jenkinsfile => jenkins}/test/Jenkinsfile | 0 jenkins/test/jenkinsfile1 | 35 +++++++++++++++++++++++ 2 files changed, 35 insertions(+) rename {jenkinsfile => jenkins}/test/Jenkinsfile (100%) create mode 100644 jenkins/test/jenkinsfile1 diff --git a/jenkinsfile/test/Jenkinsfile b/jenkins/test/Jenkinsfile similarity index 100% rename from jenkinsfile/test/Jenkinsfile rename to jenkins/test/Jenkinsfile diff --git a/jenkins/test/jenkinsfile1 b/jenkins/test/jenkinsfile1 new file mode 100644 index 0000000..00bed00 --- /dev/null +++ b/jenkins/test/jenkinsfile1 @@ -0,0 +1,35 @@ +// jenkins/test/jenkinsfile1 +pipeline { + agent any + parameters { + choice(description: '请选择你的部署环境?',name: 'active',choices: ['test','prod']) + choice(description: '请选择你的部署项目?',name: 'project',choices: ['hello']) + } + + stages { + stage('sh') { + steps{ + // 获取当前目录 + script { + // 使用 pwd() + def currentDirectory = pwd() + echo "Current directory: ${currentDirectory}" + + // 或者,您可以使用env.PWD + def alternativeDirectory = env.PWD + echo "Alternative directory: ${alternativeDirectory}" + } + // 获取当前目录 + script { + // 打印所有环境变量 + echo "All environment variables: ${env}" + + // 打印特定的环境变量 + def specificVariable = env.BUILD_NUMBER + echo "BUILD_NUMBER: ${specificVariable}" + } + } + } + // + } +} -- Gitee From 6c89afe79e80e48757a05bdd46762de672977de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:36:58 +0800 Subject: [PATCH 03/12] Changes --- jenkins/test/{jenkinsfile1 => Jenkinsfile1} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename jenkins/test/{jenkinsfile1 => Jenkinsfile1} (97%) diff --git a/jenkins/test/jenkinsfile1 b/jenkins/test/Jenkinsfile1 similarity index 97% rename from jenkins/test/jenkinsfile1 rename to jenkins/test/Jenkinsfile1 index 00bed00..ad844b3 100644 --- a/jenkins/test/jenkinsfile1 +++ b/jenkins/test/Jenkinsfile1 @@ -1,4 +1,4 @@ -// jenkins/test/jenkinsfile1 +// jenkins/test/Jenkinsfile1 pipeline { agent any parameters { -- Gitee From 47d36af2f9ed7a59192394b5dbef3fade531fc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:42:55 +0800 Subject: [PATCH 04/12] Changes --- jenkins/test/Jenkinsfile1 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/jenkins/test/Jenkinsfile1 b/jenkins/test/Jenkinsfile1 index ad844b3..73d0e90 100644 --- a/jenkins/test/Jenkinsfile1 +++ b/jenkins/test/Jenkinsfile1 @@ -9,20 +9,22 @@ pipeline { stages { stage('sh') { steps{ - // 获取当前目录 + // 目录 script { - // 使用 pwd() + // 使用 pwd()打印当前工作目录 def currentDirectory = pwd() - echo "Current directory: ${currentDirectory}" + echo "当前工作目录: ${currentDirectory}" - // 或者,您可以使用env.PWD + // env.PWD 是一个环境变量,它通常代表Jenkins工作节点上的工作目录 def alternativeDirectory = env.PWD - echo "Alternative directory: ${alternativeDirectory}" + echo "Jenkins工作空间的根目录: ${alternativeDirectory}" } - // 获取当前目录 + // 环境 script { // 打印所有环境变量 - echo "All environment variables: ${env}" + env.asMap().each { key, value -> + echo "${key}: ${value}" + } // 打印特定的环境变量 def specificVariable = env.BUILD_NUMBER -- Gitee From 907d5548cba64500c702a130a576dc1734942d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:46:49 +0800 Subject: [PATCH 05/12] Changes --- jenkins/test/Jenkinsfile1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/test/Jenkinsfile1 b/jenkins/test/Jenkinsfile1 index 73d0e90..12c3d10 100644 --- a/jenkins/test/Jenkinsfile1 +++ b/jenkins/test/Jenkinsfile1 @@ -22,8 +22,8 @@ pipeline { // 环境 script { // 打印所有环境变量 - env.asMap().each { key, value -> - echo "${key}: ${value}" + env.keySet().each { key, value -> + echo "${key}: ${env[key]}" } // 打印特定的环境变量 -- Gitee From 2ffc13bf8e53664ae39b54f9181704ea41938123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:49:24 +0800 Subject: [PATCH 06/12] Changes --- jenkins/test/Jenkinsfile1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/test/Jenkinsfile1 b/jenkins/test/Jenkinsfile1 index 12c3d10..242b726 100644 --- a/jenkins/test/Jenkinsfile1 +++ b/jenkins/test/Jenkinsfile1 @@ -22,9 +22,9 @@ pipeline { // 环境 script { // 打印所有环境变量 - env.keySet().each { key, value -> - echo "${key}: ${env[key]}" - } + env.each { key, value -> + echo "${key} = ${value}" + } // 打印特定的环境变量 def specificVariable = env.BUILD_NUMBER -- Gitee From 018b9ea35dbef7bd0421c6e8e1a9673d701e9083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:50:36 +0800 Subject: [PATCH 07/12] Changes --- jenkins/test/Jenkinsfile1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jenkins/test/Jenkinsfile1 b/jenkins/test/Jenkinsfile1 index 242b726..b996dcc 100644 --- a/jenkins/test/Jenkinsfile1 +++ b/jenkins/test/Jenkinsfile1 @@ -22,9 +22,7 @@ pipeline { // 环境 script { // 打印所有环境变量 - env.each { key, value -> - echo "${key} = ${value}" - } + sh 'env' // 打印特定的环境变量 def specificVariable = env.BUILD_NUMBER -- Gitee From 93e7bc124487b50b51c7718db421a58c57a5a329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 10:59:07 +0800 Subject: [PATCH 08/12] Changes --- jenkins/test/Jenkinsfile | 44 +++++++++++++++++++++++++++++---------- jenkins/test/Jenkinsfile1 | 35 ------------------------------- 2 files changed, 33 insertions(+), 46 deletions(-) delete mode 100644 jenkins/test/Jenkinsfile1 diff --git a/jenkins/test/Jenkinsfile b/jenkins/test/Jenkinsfile index 2f78c9f..241c4de 100644 --- a/jenkins/test/Jenkinsfile +++ b/jenkins/test/Jenkinsfile @@ -1,18 +1,39 @@ +// jenkins/test/Jenkinsfile pipeline { agent any - environment { - ENV_VAR = 'Hello' - } parameters { - string(name: 'stringParam', defaultValue: 'World', description: 'Enter your name') - booleanParam(name: 'flagParam', defaultValue: true, description: 'Enable feature flag') - choice(name: 'choiceParam', choices: ['test','prod'], description: '请选择你的部署环境') - file(name: 'fileParam', description: 'Upload a file') - password(name: 'passwordParam', defaultValue: '', description: 'Enter your password') + string(description: '请输入名字',name: 'stringParam', defaultValue: 'World') + booleanParam(description: '请输入布尔值',name: 'flagParam', defaultValue: true) + choice(description: '请选择你的部署环境',name: 'active', choices: ['test','prod']) + file(description: '上传一个文件',name: 'fileParam') + password(description: '请输入密码',name: 'passwordParam', defaultValue: '') + } + environment { + ENV_VAR = '自定义参数' } stages { - stage('打印参数') { - steps { + stage('sh阶段') { + steps{ + // 目录 + script { + // 使用 pwd()打印当前工作目录 + def currentDirectory = pwd() + echo "当前工作目录: ${currentDirectory}" + + // env.PWD 是一个环境变量,它通常代表Jenkins工作节点上的工作目录 + def alternativeDirectory = env.PWD + echo "Jenkins工作空间的根目录: ${alternativeDirectory}" + } + // 环境 + script { + // 打印所有环境变量 + sh 'env' + + // 打印特定的环境变量 + def specificVariable = env.BUILD_NUMBER + echo "BUILD_NUMBER: ${specificVariable}" + } + // 打印参数 script { // 打印本地定义参数 def localVar = 'Groovy' @@ -37,7 +58,7 @@ pipeline { } } } - stage('阶段测试') { + stage('测试阶段') { steps { script { echo "阶段阶段测试步骤" @@ -48,5 +69,6 @@ pipeline { } } } + // } } diff --git a/jenkins/test/Jenkinsfile1 b/jenkins/test/Jenkinsfile1 deleted file mode 100644 index b996dcc..0000000 --- a/jenkins/test/Jenkinsfile1 +++ /dev/null @@ -1,35 +0,0 @@ -// jenkins/test/Jenkinsfile1 -pipeline { - agent any - parameters { - choice(description: '请选择你的部署环境?',name: 'active',choices: ['test','prod']) - choice(description: '请选择你的部署项目?',name: 'project',choices: ['hello']) - } - - stages { - stage('sh') { - steps{ - // 目录 - script { - // 使用 pwd()打印当前工作目录 - def currentDirectory = pwd() - echo "当前工作目录: ${currentDirectory}" - - // env.PWD 是一个环境变量,它通常代表Jenkins工作节点上的工作目录 - def alternativeDirectory = env.PWD - echo "Jenkins工作空间的根目录: ${alternativeDirectory}" - } - // 环境 - script { - // 打印所有环境变量 - sh 'env' - - // 打印特定的环境变量 - def specificVariable = env.BUILD_NUMBER - echo "BUILD_NUMBER: ${specificVariable}" - } - } - } - // - } -} -- Gitee From eddf81d1606923fb70fedcc58c228a7c51002075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 22 Nov 2023 11:26:39 +0800 Subject: [PATCH 09/12] Changes --- .gitignore | 1 + jenkins/test/Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c38fa4e..1baf2a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea *.iml +lib diff --git a/jenkins/test/Jenkinsfile b/jenkins/test/Jenkinsfile index 241c4de..46ab15b 100644 --- a/jenkins/test/Jenkinsfile +++ b/jenkins/test/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { parameters { string(description: '请输入名字',name: 'stringParam', defaultValue: 'World') booleanParam(description: '请输入布尔值',name: 'flagParam', defaultValue: true) - choice(description: '请选择你的部署环境',name: 'active', choices: ['test','prod']) + choice(description: '请选择你的部署环境',name: 'choiceParam', choices: ['test','prod']) file(description: '上传一个文件',name: 'fileParam') password(description: '请输入密码',name: 'passwordParam', defaultValue: '') } -- Gitee From 6234ddb667ddcd3738aafb255440726a5a81dc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 29 Nov 2023 16:24:26 +0800 Subject: [PATCH 10/12] Changes --- .../docker-compose-install-v1.29.2.sh | 3 ++ .../jenkins/2.356/docker-compose.yml | 19 ++++++++++ .../jenkins/2.382/docker-compose.yml | 2 +- linux/docker-compose/jenkins/README.md | 9 +++-- .../wordpress/6.4.1/config/my.cnf | 12 +++++++ .../wordpress/6.4.1/docker-compose.yml | 35 +++++++++++++++++++ 6 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 linux/docker-compose/jenkins/2.356/docker-compose.yml create mode 100644 linux/docker-compose/wordpress/6.4.1/config/my.cnf create mode 100644 linux/docker-compose/wordpress/6.4.1/docker-compose.yml diff --git a/linux/docker-compose/docker-compose-install-v1.29.2.sh b/linux/docker-compose/docker-compose-install-v1.29.2.sh index a2a5ad7..431022d 100644 --- a/linux/docker-compose/docker-compose-install-v1.29.2.sh +++ b/linux/docker-compose/docker-compose-install-v1.29.2.sh @@ -5,11 +5,14 @@ # Supported OS: CentOS7 # Author: 霓虹深处 # Date: 2023-05-29 +# PS: 可能服务器去github下载很慢,那么可以手动下载,然后重命名为docker-compose,上传到/usr/local/bin/目录下,然后添加执行权限和创建软链接即可 ####################################################### # 定义Docker Compose版本 DOCKER_COMPOSE_VERSION="1.29.2" # 下载Docker Compose二进制文件 +# github发行版地址: https://github.com/docker/compose/releases/tag/1.29.2 +# github下载地址: https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64 sudo curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose # 添加执行权限 diff --git a/linux/docker-compose/jenkins/2.356/docker-compose.yml b/linux/docker-compose/jenkins/2.356/docker-compose.yml new file mode 100644 index 0000000..ca162e0 --- /dev/null +++ b/linux/docker-compose/jenkins/2.356/docker-compose.yml @@ -0,0 +1,19 @@ +version: '3.3' +services: + jenkins: + # https://hub.docker.com/r/jenkins/jenkins/tags?page=1&name=2.356 + image: jenkins/jenkins:2.356 + container_name: jenkins + privileged: true + user: root + ports: + - "10000:8080" + restart: unless-stopped + volumes: + - /etc/localtime:/etc/localtime + - ./data/jenkins/:/var/jenkins_home + - /var/run/docker.sock:/var/run/docker.sock + - /usr/bin/docker:/usr/bin/docker + - /usr/local/bin/docker-compose:/usr/local/bin/docker-compose + environment: + JAVA_OPTS: -Xms256m -Xmx256m -Dhudson.model.DownloadService.noSignatureCheck=true -Dhudson.security.csrf.GlobalCrumbIssuerConfiguration.DISABLE_CSRF_PROTECTION=true diff --git a/linux/docker-compose/jenkins/2.382/docker-compose.yml b/linux/docker-compose/jenkins/2.382/docker-compose.yml index 55156fa..d0538ca 100644 --- a/linux/docker-compose/jenkins/2.382/docker-compose.yml +++ b/linux/docker-compose/jenkins/2.382/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: jenkins: - # https://registry.hub.docker.com/r/jenkins/jenkins/tags?page=1&name=2.382 + # https://hub.docker.com/r/jenkins/jenkins/tags?page=1&name=2.382 image: jenkins/jenkins:2.382 container_name: jenkins privileged: true diff --git a/linux/docker-compose/jenkins/README.md b/linux/docker-compose/jenkins/README.md index 8a59d77..6f39002 100644 --- a/linux/docker-compose/jenkins/README.md +++ b/linux/docker-compose/jenkins/README.md @@ -4,9 +4,9 @@ 相关链接: -* 官网:https://www.jenkins.io/zh -* 长期支持版本:https://mirrors.jenkins.io/war-stable -* 华为开源镜像:https://repo.huaweicloud.com/jenkins/war +* [官网](https://www.jenkins.io/zh):官方网站 +* [长期支持版本](https://mirrors.jenkins.io/war-stable):查看长期支持的版本 +* [华为开源镜像](https://repo.huaweicloud.com):可以下载jenkins的war 版本要求: @@ -22,6 +22,9 @@ ```shell docker-compose up -d docker-compose down + +# +curl -sSL https://gitee.com/neondeep/script/raw/master/linux/docker-compose/jenkins/2.382/docker-compose.yml > docker-compose.yml docker-compose up -d ``` 安装JDK17版本:复制docker-compose-jdk17.yml到服务器,并执行以下命令 diff --git a/linux/docker-compose/wordpress/6.4.1/config/my.cnf b/linux/docker-compose/wordpress/6.4.1/config/my.cnf new file mode 100644 index 0000000..b9b02fa --- /dev/null +++ b/linux/docker-compose/wordpress/6.4.1/config/my.cnf @@ -0,0 +1,12 @@ +[mysql] +default-character-set=utf8mb4 + +[mysqld] +character-set-server=utf8mb4 +#设置时区 +default-time_zone='+8:00' +#更改严格模式 +sql_mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION" + +[client] +default-character-set=utf8mb4 \ No newline at end of file diff --git a/linux/docker-compose/wordpress/6.4.1/docker-compose.yml b/linux/docker-compose/wordpress/6.4.1/docker-compose.yml new file mode 100644 index 0000000..48a0311 --- /dev/null +++ b/linux/docker-compose/wordpress/6.4.1/docker-compose.yml @@ -0,0 +1,35 @@ +version: "3.8" +services: + wordpress: + # https://hub.docker.com/r/bitnami/wordpress + image: bitnami/wordpress:6.4.1 + container_name: wordpress + restart: unless-stopped + user: root + environment: + WORDPRESS_DATABASE_HOST: mysql + WORDPRESS_DATABASE_PORT_NUMBER: 3306 + WORDPRESS_DATABASE_USER: root + WORDPRESS_DATABASE_PASSWORD: HRiHZaOPmSiTroYmPXkqca78dzajyVSs + WORDPRESS_DATABASE_NAME: wordpress + WORDPRESS_USERNAME: admin + WORDPRESS_PASSWORD: 123456 + ports: + - '8080:8080' + volumes: + - './data/wordpress:/bitnami/wordpress' + depends_on: + - mysql + mysql: + # https://hub.docker.com/_/mysql + image: mysql:5.7 + container_name: wordpress_mysql + restart: unless-stopped + environment: + MYSQL_ROOT_PASSWORD: HRiHZaOPmSiTroYmPXkqca78dzajyVSs + MYSQL_DATABASE: wordpress + ports: + - "13306:3306" + volumes: + - './config/my.cnf:/etc/my.cnf' + - './data/mysql:/var/lib/mysql' -- Gitee From 92180a25937949cc8f222a0f0d427a907b8191e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 29 Nov 2023 16:53:24 +0800 Subject: [PATCH 11/12] Changes --- linux/docker-compose/jenkins/README.md | 30 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/linux/docker-compose/jenkins/README.md b/linux/docker-compose/jenkins/README.md index 6f39002..b327858 100644 --- a/linux/docker-compose/jenkins/README.md +++ b/linux/docker-compose/jenkins/README.md @@ -15,29 +15,49 @@ * 2.54 (April 2017) and newer:Java 8 * 1.612 (May 2015) and newer:Java 7 +> jenkins安装必要插件:Pipeline、Git、Localization: Chinese (Simplified) + ## 2.382 -安装JDK11版本:复制docker-compose.yml到服务器,并执行以下命令 +docker-compose.yml:该版本支持JDK11 ```shell +# 复制docker-compose.yml到服务器,并执行以下命令 docker-compose up -d docker-compose down -# -curl -sSL https://gitee.com/neondeep/script/raw/master/linux/docker-compose/jenkins/2.382/docker-compose.yml > docker-compose.yml docker-compose up -d +# 一键安装 +curl -sSL https://gitee.com/neondeep/script/raw/master/linux/docker-compose/jenkins/2.382/docker-compose.yml > docker-compose.yml && docker-compose up -d ``` -安装JDK17版本:复制docker-compose-jdk17.yml到服务器,并执行以下命令 +docker-compose-jdk17.yml:该版本支持JDK17 ```shell +# 复制docker-compose-jdk17.yml到服务器,并执行以下命令 docker-compose -f docker-compose-jdk17.yml up -d docker-compose -f docker-compose-jdk17.yml down + +# 一键安装 +curl -sSL https://gitee.com/neondeep/script/raw/master/linux/docker-compose/jenkins/2.382/docker-compose-jdk17.yml > docker-compose.yml && docker-compose up -d ``` -安装JDK11版本并挂载maven:复制docker-compose-volumes-maven.yml到服务器,并执行以下命令 +docker-compose-volumes-maven.yml:该版本支持JDK11,并挂载宿主机maven > 注意:在执行命令之前,先保证宿主机已经安装maven,然后更改docker-compose-volumes-maven.yml里面的volumes保证正确挂载maven ```shell +# 复制docker-compose-volumes-maven.yml到服务器,并执行以下命令 docker-compose -f docker-compose-volumes-maven.yml up -d docker-compose -f docker-compose-volumes-maven.yml down +``` + +## 2.356 + +docker-compose.yml:该版本支持JDK8 + +```shell +docker-compose up -d +docker-compose down + +# 一键安装 +curl -sSL https://gitee.com/neondeep/script/raw/master/linux/docker-compose/jenkins/2.356/docker-compose.yml > docker-compose.yml && docker-compose up -d ``` \ No newline at end of file -- Gitee From 37e2c75e28892d2689a757bf6b6ecacab1d91901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=93=E8=99=B9=E6=B7=B1=E5=A4=84?= <1308207524@qq.com> Date: Wed, 29 Nov 2023 16:56:42 +0800 Subject: [PATCH 12/12] Changes --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0aaa5bd..28640c2 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ 本项目包含了针对 Linux 和 Windows 系统的多种脚本,涵盖了广泛的使用场景,使用户能够快速搭建开发环境、部署应用以及进行常见任务的自动化,加速开发和提高工作效率。 +相关链接: + +* [gitee](https://gitee.com/neondeep/script):代码仓库,存放的源代码 + ## 项目结构 ``` -- Gitee