From e51e6a873a35dfa74e27a9039d0ef8ea3c86e721 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Fri, 9 Dec 2022 20:34:34 +0600 Subject: [PATCH 1/2] Run GH actions on ubuntu-20.04 (#1120) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> Signed-off-by: 1gtm <1gtm@appscode.com> --- .github/workflows/cherry-pick.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/release-tracker.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml index d254244f5..8b2f46e92 100644 --- a/.github/workflows/cherry-pick.yml +++ b/.github/workflows/cherry-pick.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93b2d22d7..c28b3318e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: jobs: build: name: Build - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Set up Go 1.19 uses: actions/setup-go@v1 diff --git a/.github/workflows/release-tracker.yml b/.github/workflows/release-tracker.yml index 95308eafe..e2e10fc39 100644 --- a/.github/workflows/release-tracker.yml +++ b/.github/workflows/release-tracker.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 962a65a8b..4733b0409 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: build: name: Build - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out code into the Go module directory uses: actions/checkout@v1 From 4f4cf69acb6208ec4fdd601f635ec163290e414b Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Sun, 11 Dec 2022 11:36:00 +0600 Subject: [PATCH 2/2] Use PostgreSQL apt-archive repo Signed-off-by: Emruz Hossain --- Dockerfile.dbg | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dbg b/Dockerfile.dbg index 4bee70ca3..c66fff636 100644 --- a/Dockerfile.dbg +++ b/Dockerfile.dbg @@ -36,8 +36,15 @@ ENV DEBIAN_FRONTEND noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN true RUN set -x \ + && rm -rf /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends apt-transport-https ca-certificates tzdata locales software-properties-common + +# Use postgresql apt-archive repository. +# ref: https://www.postgresql.org/message-id/Y2kmqL%2BpCuSZiQBV%40msg.df7cb.de +RUN set -x \ + && add-apt-repository "deb https://apt-archive.postgresql.org/pub/repos/apt stretch-pgdg main" \ && apt-get update \ - && apt-get install -y --no-install-recommends ca-certificates tzdata locales \ && rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/* \ && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \ && echo 'Etc/UTC' > /etc/timezone && dpkg-reconfigure tzdata