10000 Revert dockerbuild configurations for now (#179) · sorokinvld/postgres@5c638b1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5c638b1

Browse files
dragarciadragarcia
authored
Revert dockerbuild configurations for now (supabase#179)
* revert work done for docker multi-arch for now * ensure that custom PG files are used in EC2 builds * just remove linux/arm64 for now * remove unneeded platform k-v
1 parent a2b5ff1 commit 5c638b1

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

‎.github/workflows/dockerhub-release.yml

Lines changed: 6 additions & 15 deletions
40
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ on:
1010

1111
jobs:
1212
docker_release:
13-
runs-on: [self-hosted, linux]
14-
timeout-minutes: 360
15-
13+
runs-on: ubuntu-20.04
1614
steps:
1715
- uses: actions/checkout@v2
1816

@@ -25,21 +23,14 @@ jobs:
2523
POSTGRES_VERSION=$(cat docker.vars.json | jq -r '.["postgres-version"]')
2624
echo "::set-output name=postgres_version::$POSTGRES_VERSION"
2725
26+
PLATFORM=$(cat docker.vars.json | jq -r '.["platform"]')
27+
echo "::set-output name=platform::$PLATFORM"
28+
2829
- uses: docker/setup-qemu-action@v1
2930
with:
3031
platforms: amd64,arm64
3132

32-
- name: Set up Docker Context for Buildx
33-
id: buildx-context
34-
run: |
35-
docker context create builders
36-
37-
- name: Set up Docker Buildx
38-
id: buildx
39-
uses: docker/setup-buildx-action@v1
-
with:
41-
version: latest
42-
endpoint: builders
33+
- uses: docker/setup-buildx-action@v1
4334

4435
- uses: docker/login-action@v1
4536
with:
@@ -51,6 +42,6 @@ jobs:
5142
context: .
5243
push: true
5344
tags: supabase/postgres:latest,supabase/postgres:${{ steps.settings.outputs.docker_version }}
54-
platforms: linux/amd64,linux/arm64
45+
platforms: linux/amd64
5546
build-args: |
5647
"VERSION=${{steps.settings.outputs.postgres_version}}"

‎ansible/files/postgresql_config/postgresql.conf.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,9 +787,9 @@ jit_provider = 'llvmjit' # JIT library to use
787787
#include = '...' # include file
788788

789789
# Automatically generated optimizations
790-
include = '/etc/postgresql-custom/generated-optimizations.conf'
790+
#include = '/etc/postgresql-custom/generated-optimizations.conf'
791791
# User-supplied custom parameters, override any automatically generated ones
792-
include = '/etc/postgresql-custom/custom-overrides.conf'
792+
#include = '/etc/postgresql-custom/custom-overrides.conf'
793793

794794
#------------------------------------------------------------------------------
795795
# CUSTOMIZED OPTIONS

‎ansible/tasks/setup-supabase-internal.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,20 @@
5454
state: directory
5555
owner: vector
5656

57+
- name: Include file for generated optimizations in postgresql.conf
58+
become: yes
59+
replace:
60+
path: /etc/postgresql/postgresql.conf
61+
regexp: "#include = '/etc/postgresql-custom/generated-optimizations.conf'"
62+
replace: "include = '/etc/postgresql-custom/generated-optimizations.conf'"
63+
64+
- name: Include file for custom overrides in postgresql.conf
65+
become: yes
66+
replace:
67+
path: /etc/postgresql/postgresql.conf
68+
regexp: "#include = '/etc/postgresql-custom/custom-overrides.conf'"
69+
replace: "include = '/etc/postgresql-custom/custom-overrides.conf'"
70+
5771
- name: Install Postgres exporter
5872
import_tasks: internal/postgres-exporter.yml
5973

‎docker.vars.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"docker-version": "14.1.0.15",
2+
"docker-version": "14.1.0.19",
33
"postgres-version": "14.1"
44
}

0 commit comments

Comments
 (0)
0