Revert dockerbuild configurations for now (#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

Author: dragarcia

.github/workflows/dockerhub-release.yml

@@ -10,9 +10,7 @@ on:
 
 jobs:
   docker_release:
-    runs-on: [self-hosted, linux]
-    timeout-minutes: 360
-
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
 
@@ -25,21 +23,14 @@ jobs:
           POSTGRES_VERSION=$(cat docker.vars.json | jq -r '.["postgres-version"]')
           echo "::set-output name=postgres_version::$POSTGRES_VERSION"
 
+          PLATFORM=$(cat docker.vars.json | jq -r '.["platform"]')
+          echo "::set-output name=platform::$PLATFORM"
+
       - uses: docker/setup-qemu-action@v1
         with:
           platforms: amd64,arm64
 
-      - name: Set up Docker Context for Buildx
-        id: buildx-context
-        run: |
-          docker context create builders
-          
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
-          endpoint: builders
+      - uses: docker/setup-buildx-action@v1
 
       - uses: docker/login-action@v1
         with:
@@ -51,6 +42,6 @@ jobs:
           context: .
           push: true
           tags: supabase/postgres:latest,supabase/postgres:${{ steps.settings.outputs.docker_version }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           build-args: |
             "VERSION=${{steps.settings.outputs.postgres_version}}"

ansible/files/postgresql_config/postgresql.conf.j2

@@ -787,9 +787,9 @@ jit_provider = 'llvmjit'		# JIT library to use
 #include = '...'			# include file
 
 # Automatically generated optimizations
-include = '/etc/postgresql-custom/generated-optimizations.conf'
+#include = '/etc/postgresql-custom/generated-optimizations.conf'
 # User-supplied custom parameters, override any automatically generated ones
-include = '/etc/postgresql-custom/custom-overrides.conf'
+#include = '/etc/postgresql-custom/custom-overrides.conf'
 
 #------------------------------------------------------------------------------
 # CUSTOMIZED OPTIONS

ansible/tasks/setup-supabase-internal.yml

@@ -54,6 +54,20 @@
     state: directory
     owner: vector
 
+- name: Include file for generated optimizations in postgresql.conf
+  become: yes
+  replace:
+    path: /etc/postgresql/postgresql.conf
+    regexp: "#include = '/etc/postgresql-custom/generated-optimizations.conf'"
+    replace: "include = '/etc/postgresql-custom/generated-optimizations.conf'"
+
+- name: Include file for custom overrides in postgresql.conf
+  become: yes
+  replace:
+    path: /etc/postgresql/postgresql.conf
+    regexp: "#include = '/etc/postgresql-custom/custom-overrides.conf'"
+    replace: "include = '/etc/postgresql-custom/custom-overrides.conf'"
+
 - name: Install Postgres exporter
   import_tasks: internal/postgres-exporter.yml
 

docker.vars.json

@@ -1,4 +1,4 @@
 {
-  "docker-version": "14.1.0.15",
+  "docker-version": "14.1.0.19",
   "postgres-version": "14.1"
 }