diff --git a/.github/workflows/publish_ghcr_image.yaml b/.github/workflows/publish_ghcr_image.yaml index 2425e39b3..781ec6775 100644 --- a/.github/workflows/publish_ghcr_image.yaml +++ b/.github/workflows/publish_ghcr_image.yaml @@ -7,8 +7,11 @@ env: on: push: + branches: + - 's3_comp' tags: - '*' + workflow_dispatch: jobs: publish: @@ -25,26 +28,26 @@ jobs: with: go-version: "^1.25.3" - - name: Run unit tests - run: make test - - - name: Define image name - id: image - run: | - OPERATOR_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}" - echo "OPERATOR_IMAGE=$OPERATOR_IMAGE" >> $GITHUB_OUTPUT - - - name: Define pooler image name - id: image_pooler - run: | - POOLER_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/pgbouncer:${GITHUB_REF/refs\/tags\//}" - echo "POOLER_IMAGE=$POOLER_IMAGE" >> $GITHUB_OUTPUT - - - name: Define UI image name - id: image_ui - run: | - UI_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME_UI }}:${GITHUB_REF/refs\/tags\//}" - echo "UI_IMAGE=$UI_IMAGE" >> $GITHUB_OUTPUT + # - name: Run unit tests + # run: make test + # + # - name: Define image name + # id: image + # run: | + # OPERATOR_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}" + # echo "OPERATOR_IMAGE=$OPERATOR_IMAGE" >> $GITHUB_OUTPUT + # + # - name: Define pooler image name + # id: image_pooler + # run: | + # POOLER_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/pgbouncer:${GITHUB_REF/refs\/tags\//}" + # echo "POOLER_IMAGE=$POOLER_IMAGE" >> $GITHUB_OUTPUT + # + # - name: Define UI image name + # id: image_ui + # run: | + # UI_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME_UI }}:${GITHUB_REF/refs\/tags\//}" + # echo "UI_IMAGE=$UI_IMAGE" >> $GITHUB_OUTPUT - name: Define logical backup image name id: image_lb @@ -65,33 +68,33 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push multiarch operator image to ghcr - uses: docker/build-push-action@v3 - with: - context: . - file: docker/Dockerfile - push: true - build-args: BASE_IMAGE=alpine:3 - tags: "${{ steps.image.outputs.OPERATOR_IMAGE }}" - platforms: linux/amd64,linux/arm64 - - - name: Build and push multiarch pooler image to ghcr - uses: docker/build-push-action@v3 - with: - context: pooler - push: true - build-args: BASE_IMAGE=alpine:3.22 - tags: "${{ steps.image_pooler.outputs.POOLER_IMAGE }}" - platforms: linux/amd64,linux/arm64 - - - name: Build and push multiarch ui image to ghcr - uses: docker/build-push-action@v3 - with: - context: ui - push: true - build-args: BASE_IMAGE=python:3.11-slim - tags: "${{ steps.image_ui.outputs.UI_IMAGE }}" - platforms: linux/amd64,linux/arm64 + # - name: Build and push multiarch operator image to ghcr + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: docker/Dockerfile + # push: true + # build-args: BASE_IMAGE=alpine:3 + # tags: "${{ steps.image.outputs.OPERATOR_IMAGE }}" + # platforms: linux/amd64,linux/arm64 + # + # - name: Build and push multiarch pooler image to ghcr + # uses: docker/build-push-action@v3 + # with: + # context: pooler + # push: true + # build-args: BASE_IMAGE=alpine:3.22 + # tags: "${{ steps.image_pooler.outputs.POOLER_IMAGE }}" + # platforms: linux/amd64,linux/arm64 + # + # - name: Build and push multiarch ui image to ghcr + # uses: docker/build-push-action@v3 + # with: + # context: ui + # push: true + # build-args: BASE_IMAGE=python:3.11-slim + # tags: "${{ steps.image_ui.outputs.UI_IMAGE }}" + # platforms: linux/amd64,linux/arm64 - name: Build and push multiarch logical-backup image to ghcr uses: docker/build-push-action@v3 diff --git a/.github/workflows/run_e2e.yaml b/.github/workflows/run_e2e.yaml.bak similarity index 100% rename from .github/workflows/run_e2e.yaml rename to .github/workflows/run_e2e.yaml.bak diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml.bak similarity index 100% rename from .github/workflows/run_tests.yaml rename to .github/workflows/run_tests.yaml.bak diff --git a/logical-backup/dump.sh b/logical-backup/dump.sh index 7833de399..548037790 100755 --- a/logical-backup/dump.sh +++ b/logical-backup/dump.sh @@ -50,6 +50,14 @@ function az_upload { az storage blob upload --file "$1" --account-name "$LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_NAME" --account-key "$LOGICAL_BACKUP_AZURE_STORAGE_ACCOUNT_KEY" -c "$LOGICAL_BACKUP_AZURE_STORAGE_CONTAINER" -n "$PATH_TO_BACKUP" } +function aws_init_profile { + + if [[ ! -z "$AWS_PROFILE_CONTENT" ]] ; then + mkdir -p $HOME/.aws + echo "$AWS_PROFILE_CONTENT" > $HOME/.aws/config + fi +} + function aws_delete_objects { args=( "--bucket=$LOGICAL_BACKUP_S3_BUCKET" @@ -111,8 +119,14 @@ function aws_upload { args=() + if [[ ! -z "$LOGICAL_BACKUP_S3_ACCELERATE_ENDPOINT" ]] ; then + # use accelerate_endpoint on upload + args+=("--endpoint-url=$LOGICAL_BACKUP_S3_ACCELERATE_ENDPOINT") + elif [[ ! -z "$LOGICAL_BACKUP_S3_ENDPOINT" ]]; then + args+=("--endpoint-url=$LOGICAL_BACKUP_S3_ENDPOINT") + fi + [[ ! -z "$EXPECTED_SIZE" ]] && args+=("--expected-size=$EXPECTED_SIZE") - [[ ! -z "$LOGICAL_BACKUP_S3_ENDPOINT" ]] && args+=("--endpoint-url=$LOGICAL_BACKUP_S3_ENDPOINT") [[ ! -z "$LOGICAL_BACKUP_S3_REGION" ]] && args+=("--region=$LOGICAL_BACKUP_S3_REGION") [[ ! -z "$LOGICAL_BACKUP_S3_SSE" ]] && args+=("--sse=$LOGICAL_BACKUP_S3_SSE") @@ -145,6 +159,7 @@ function upload { gcs_upload ;; "s3") + aws_init_profile aws_upload $(($(estimate_size) / DUMP_SIZE_COEFF)) aws_delete_outdated ;;