diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d699c10..838b131 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: VERSION=${{ env.APP_VERSION }}.${{ github.run_number }} EN_AWS_CLI=true EN_AZURE=true - EN_GCLOUD=false + EN_GCLOUD=true EN_MINIO=true EN_RCLONE=true EN_GPG=true @@ -98,7 +98,7 @@ jobs: VERSION=${{ env.APP_VERSION }}.${{ github.run_number }} EN_AWS_CLI=true EN_AZURE=true - EN_GCLOUD=false + EN_GCLOUD=true EN_MINIO=true EN_RCLONE=true EN_GPG=true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a36784..3115e88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,14 +29,14 @@ jobs: needs: set-build-env strategy: matrix: - feature: [aws, azure, minio, rclone] + feature: [aws, azure, gcloud, minio, rclone] include: - feature: aws arg: EN_AWS_CLI=true - feature: azure arg: EN_AZURE=true - # - feature: gcloud - # arg: EN_GCLOUD=true + - feature: gcloud + arg: EN_GCLOUD=true - feature: minio arg: EN_MINIO=true - feature: rclone @@ -98,7 +98,7 @@ jobs: VERSION=${{ needs.set-build-env.outputs.buildId }} EN_AWS_CLI=true EN_AZURE=true - EN_GCLOUD=false + EN_GCLOUD=true EN_MINIO=true EN_RCLONE=true EN_GPG=true diff --git a/Dockerfile b/Dockerfile index f229b6b..de7bad1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG AZURE_CLI_VERSION=2.32.0 ARG EN_GCLOUD=false ARG GOOGLE_CLOUD_SDK_VERSION=370.0.0 ARG EN_GPG=true -ARG GNUPG_VERSION="2.2.40-r0" +ARG GNUPG_VERSION="2.2.31-r2" ARG EN_MINIO=false ARG EN_RCLONE=false @@ -70,7 +70,7 @@ WORKDIR / COPY build.sh /tmp RUN /tmp/build.sh - +ENV PATH="/google-cloud-sdk/bin:${PATH}" COPY --from=mgob-builder /go/src/github.com/stefanprodan/mgob/mgob . COPY --from=tools-builder /go/mongo-tools/bin/* /usr/bin/ diff --git a/build.sh b/build.sh index 552edec..abf35d6 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ apk add --no-cache ca-certificates tzdata bash curl krb5-dev # Install GnuPG if [ "_${MGOB_EN_GPG}" = "_true" ] then - apk add gnupg=${GNUPG_VERSION} + apk add --no-cache gnupg=${GNUPG_VERSION} fi cd /tmp