From 9c954eef036ef5a4f23b898f25c6c0bbd5866e53 Mon Sep 17 00:00:00 2001 From: jeessy2 <6205259+jeessy2@users.noreply.github.com> Date: Tue, 3 Jan 2023 13:33:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20docker=E4=B8=AD=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81arm7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 2 +- Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8d375a4..a6a8327 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest env: DOCKER_REPO: jeessy/backup-x - DOCKER_PLATFORMS: linux/amd64,linux/arm,linux/arm64 + DOCKER_PLATFORMS: linux/amd64,linux/arm64 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 1b34a75..ebf8439 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ FROM golang:1.19 AS builder WORKDIR /app COPY . . RUN go env -w GO111MODULE=on \ - && go env -w GOPROXY=https://goproxy.cn,direct \ && make clean test build # build s3sync @@ -31,7 +30,7 @@ RUN apt-get -y update \ # https://www.postgresql.org/download/linux/debian/ RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && apt-get update + && apt-get -y update RUN apt-get install -y postgresql-client-14 \ && apt-get install -y default-mysql-client