Skip to content

Commit

Permalink
Merge pull request #55 from woblerr/bump_infr
Browse files Browse the repository at this point in the history
  • Loading branch information
woblerr authored Jan 2, 2025
2 parents 3b25cf6 + 9678307 commit ade3092
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
latest_version: "2.54.1"
download_url: "https://github.com/pgbackrest/pgbackrest/archive/release"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get repo tag
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
Expand All @@ -25,14 +25,16 @@ jobs:
echo ::set-output name=repo_tag::$(echo ${GITHUB_REF} | cut -d'/' -f3)
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Available platforms
run: echo ${{ steps.buildx.outputs.platforms }}
run: echo ${BUILDX_PLATFORMS}
env:
BUILDX_PLATFORMS: ${{ steps.buildx.outputs.platforms }}

- name: Build pgbackrest image
run: |
Expand Down Expand Up @@ -155,7 +157,7 @@ jobs:
env:
download_url: "https://github.com/arenadata/pgbackrest/archive"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Get repo tag
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
Expand All @@ -164,14 +166,16 @@ jobs:
echo ::set-output name=repo_tag::$(echo ${GITHUB_REF} | cut -d'/' -f3)
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Available platforms
run: echo ${{ steps.buildx.outputs.platforms }}
run: echo ${BUILDX_PLATFORMS}
env:
BUILDX_PLATFORMS: ${{ steps.buildx.outputs.platforms }}

- name: Build pgbackrest gpdb image
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS builder
FROM ubuntu:24.04 AS builder

ARG BACKREST_VERSION
ARG BACKREST_DOWNLOAD_URL="https://github.com/pgbackrest/pgbackrest/archive/release"
Expand Down Expand Up @@ -42,7 +42,7 @@ RUN wget ${BACKREST_COMPLETION_VERSION_URL}/${BACKREST_COMPLETION_VERSION}.tar.g
&& tar -xzf /tmp/pgbackrest-bash-completion-${BACKREST_COMPLETION_VERSION}.tar.gz -C /tmp \
&& mv /tmp/pgbackrest-bash-completion-$(echo ${BACKREST_COMPLETION_VERSION} | tr -d v) /tmp/pgbackrest-bash-completion

FROM ubuntu:22.04
FROM ubuntu:24.04

ARG REPO_BUILD_TAG

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

ARG BACKREST_VERSION
ARG BACKREST_DOWNLOAD_URL="https://github.com/pgbackrest/pgbackrest/archive/release"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_make
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS builder
FROM ubuntu:24.04 AS builder

ARG BACKREST_VERSION
ARG BACKREST_DOWNLOAD_URL="https://github.com/pgbackrest/pgbackrest/archive/release"
Expand Down Expand Up @@ -35,7 +35,7 @@ RUN wget ${BACKREST_COMPLETION_VERSION_URL}/${BACKREST_COMPLETION_VERSION}.tar.g
&& tar -xzf /tmp/pgbackrest-bash-completion-${BACKREST_COMPLETION_VERSION}.tar.gz -C /tmp \
&& mv /tmp/pgbackrest-bash-completion-$(echo ${BACKREST_COMPLETION_VERSION} | tr -d v) /tmp/pgbackrest-bash-completion

FROM ubuntu:22.04
FROM ubuntu:24.04

ARG REPO_BUILD_TAG

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_make.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

ARG BACKREST_VERSION
ARG BACKREST_DOWNLOAD_URL="https://github.com/pgbackrest/pgbackrest/archive/release"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 - 2024 woblerr
Copyright (c) 2021 - 2025 woblerr

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit ade3092

Please sign in to comment.