diff --git a/.drone.yml b/.drone.yml index 0b61d7f..63e4c80 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,8 +21,11 @@ steps: password: from_secret: ssh_password script: + - env - apt -y install git - - echo ${DRONE_REPO_BRANCH} - - echo ${DRONE_COMMIT_SHA} - #- mkdir -p ~/publish/docker-lan && cd $_ + - mkdir -p ~/publish/cicd && cd $_ + - git init + - git remoteadd origin http://10.10.14.176:3000/examples/DockerComposeCICD.git + - git fetch origin +refs/heads/master + - git checkout ${DRONE_COMMIT_SHA} -b ${DRONE_REPO_BRANCH} #- ./start.sh diff --git a/README.md b/README.md index 7b5590a..01d8e34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ # gitea + drone + drone runner + registry 作为 git 服务器,自动测试、构建和打包镜像并发布到私有仓库 -## docker compose 配置网络后才能访问到宿主机 ip +## gitea ssh 密钥 + +1.执行:sh-keygen -t ed25519 -C "youname@domain.com" 生成:%USERNAME%/.ssh/id_ed25519.pub +2.配置:http://10.10.14.176:3000/user/settings/keys 添加id_ed25519.pub内容作为key + +## docker compose 显式配置网络后才能访问到宿主机 ip ``` networks: default: diff --git a/docker-compose.yml b/docker-compose.yml index ff22cbf..6e33dfc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,10 +60,11 @@ services: - USER_GID=1000 ports: - 3000:3000 - - 222:22 + - ${IP}:222:22 volumes: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + - /home/git/.ssh/:/data/git/.ssh - ./conf/gitea/custom:/data/gitea/custom - ./data/gitea:/data drone: #https://docs.drone.io/server/provider/gitea/ https://github.com/drone/drone