diff --git a/.drone.yml b/.drone.yml index dcc25cd..82c1575 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,18 +20,8 @@ steps: from_secret: docker_token commands: - docker login git.domainpay.top -u $DOCKER_LOGIN -p $DOCKER_TOKEN - - docker build -t git.domainpay.top/danial/kami_shop_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0 + - docker build -t git.domainpay.top/danial/kami_shop_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . - docker tag git.domainpay.top/danial/kami_shop_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.domainpay.top/danial/kami_shop_${DRONE_BRANCH}:latest - docker push git.domainpay.top/danial/kami_shop_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} - docker push git.domainpay.top/danial/kami_shop_${DRONE_BRANCH}:latest - docker logout git.domainpay.top - - name: deploy to docker compose - environment: - DOCKER_LOGIN: - from_secret: docker_login - DOCKER_TOKEN: - from_secret: docker_token - commands: - - docker login git.domainpay.top -u $DOCKER_LOGIN -p $DOCKER_TOKEN - - BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile shop up -d - - docker logout git.domainpay.top diff --git a/deploy/Dockerfile b/deploy/Dockerfile index baa7f64..fc5bab7 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24 AS builder +FROM golang:1.25 AS builder WORKDIR /build @@ -27,9 +27,7 @@ ENV shopAddr="" ARG USE_PROXY #设置国内镜像源,时区 -RUN echo "https://mirrors.aliyun.com/alpine/v3.18/main/" > /etc/apk/repositories && \ - echo "https://mirrors.aliyun.com/alpine/v3.18/community/" >> /etc/apk/repositories; \ - apk update && \ +RUN apk update && \ apk upgrade && \ apk add --no-cache tzdata && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \