diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 714f5d1..0dda748 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -34,12 +34,6 @@ jobs: - name: Build final Docker image run: | - echo 'FROM docker.hub.ipao.vip/alpine:3.20' > Dockerfile - echo 'COPY config.yml /root/.exporter.yml' >> Dockerfile - echo 'COPY build/exporter /usr/local/bin/exporter' >> Dockerfile - echo 'WORKDIR /root' >> Dockerfile - echo 'ENTRYPOINT ["/usr/local/bin/exporter"]' >> Dockerfile - echo 'CMD [ "serve" ]' >> Dockerfile docker login -u ${{ secrets.DOCKER_AF_USERNAME }} -p ${{ secrets.DOCKER_AF_PASSWORD }} docker-af.hub.ipao.vip docker build --push -t docker-af.hub.ipao.vip/rogeecn/tg-exporter:latest . diff --git a/Dockerfile b/Dockerfile index 56b66d8..4d2b18a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,10 @@ -FROM docker.hub.ipao.vip/golang:1.22-alpine as builder - -COPY . /app - -WORKDIR /app - -RUN go env -w GOPROXY=https://go.hub.ipao.vip,direct && \ - go env -w GO111MODULE=on && \ - cd /app && \ - go mod tidy - -RUN go build -o /app/exporter . - - FROM docker.hub.ipao.vip/alpine:3.20 -COPY --from=builder /app/exporter /usr/local/bin/exporter COPY config.yml /root/.exporter.yml +COPY build/exporter /usr/local/bin/exporter WORKDIR /root ENTRYPOINT ["/usr/local/bin/exporter"] -CMD [ "serve" ] \ No newline at end of file + +CMD [ "serve" ]