diff --git a/%USERPROFILE%.dockerdaemon.json b/%USERPROFILE%.dockerdaemon.json new file mode 100644 index 0000000..11c4b9b --- /dev/null +++ b/%USERPROFILE%.dockerdaemon.json @@ -0,0 +1 @@ +{"insecure-registries":["192.168.1.154:31010"]} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b74fb8..0e55f76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,15 +9,13 @@ variables: CI_REGISTRY_USER: "docker" CI_REGISTRY_PASSWORD: "dockerxn001624." -before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - # 构建镜像 build_image: stage: build - image: alpine:latest + image: 192.168.1.154:31010/alpine:latest script: - apk add --no-cache docker-cli + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker build -t $DOCKER_IMAGE_NAME:$DOCKER_TAG . only: - main @@ -25,7 +23,7 @@ build_image: # 部署服务 deploy_service: stage: deploy - image: docker/compose:latest + image: 192.168.1.154:31010/docker/compose:latest script: # 停止旧容器(如果存在) - docker-compose down --remove-orphans || true diff --git a/CUsers$USER.dockerdaemon.json b/CUsers$USER.dockerdaemon.json new file mode 100644 index 0000000..6a94203 --- /dev/null +++ b/CUsers$USER.dockerdaemon.json @@ -0,0 +1 @@ +{insecure-registries:[192.168.1.154:31010]} diff --git a/Dockerfile b/Dockerfile index 079a844..317bee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ COPY . . RUN go build -o server ./cmd/server # Run Stage -FROM alpine:latest +FROM 192.168.1.154:31010/alpine:latest WORKDIR /app