From e3ed7b1e622488c4ea42b29b1de71919c782f5c9 Mon Sep 17 00:00:00 2001
From: jon r <jon@gnosis.io>
Date: Tue, 18 Jul 2023 21:52:27 +0200
Subject: [PATCH 1/2] APP-370: fix(build): remove extensions container

---
 .github/workflows/build-push.extensions.yml | 39 ---------------------
 .github/workflows/build-push.yml            |  2 --
 .github/workflows/release-version.yml       |  8 -----
 Dockerfile.extensions                       | 19 ----------
 src/api-db-migrations/extensions.sql        |  2 --
 5 files changed, 70 deletions(-)
 delete mode 100644 .github/workflows/build-push.extensions.yml
 delete mode 100644 Dockerfile.extensions
 delete mode 100644 src/api-db-migrations/extensions.sql

diff --git a/.github/workflows/build-push.extensions.yml b/.github/workflows/build-push.extensions.yml
deleted file mode 100644
index af359034..00000000
--- a/.github/workflows/build-push.extensions.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Extensions
-
-on:
-  release:
-    types: [published]
-  push:
-    branches:
-    - main
-    - next
-    - dev
-    paths:
-    - "Dockerfile.extensions"
-    - "src/api-db-extensions/**"
-    - ".github/workflows/build-push.extensions.yml"
-  workflow_call:
-    inputs:
-      ref:
-        required: true
-        type: string
-        default: ${{ github.ref }}
-
-jobs:
-  call-build-and-push:
-    name: Call image build
-    uses: CirclesUBI/.github/.github/workflows/build-and-push.yml@main
-    if: ( inputs.ref == 0 )
-    with:
-      image-name: "api-server-extensions"
-      file: "Dockerfile.extensions"
-    secrets: inherit
-  call-build-and-push-ref:
-    name: Call tagged image build
-    uses: CirclesUBI/.github/.github/workflows/build-and-push.yml@main
-    if: ( inputs.ref != 0 )
-    with:
-      image-name: "api-server-extensions"
-      file: "Dockerfile.extensions"
-      ref: ${{ inputs.ref }}
-    secrets: inherit
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index f84acbf3..7f265914 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -10,14 +10,12 @@ on:
     - dev
     paths-ignore:
     - "src/api-db-migrations/**"
-    - ".github/workflows/build-push.extensions.yml"
     - ".github/workflows/build-push.migrations.yml"
     - ".github/workflows/pr-labeler.yml"
     - ".github/workflows/release-drafter.yml"
     - ".github/workflows/release-version.yml"
     - ".github/pr-labeler.yml"
     - ".github/release-drafter.yml"
-    - "Dockerfile.extensions"
     - "Dockerfile.migrations"
   workflow_call:
     inputs:
diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml
index 3e16e563..1816d15e 100644
--- a/.github/workflows/release-version.yml
+++ b/.github/workflows/release-version.yml
@@ -37,14 +37,6 @@ jobs:
     with:
       ref: "refs/tags/v${{ needs.tag-release.outputs.current-version }}"
     secrets: inherit
-  call-build-push-extensions:
-    name: Build tagged Extensions image
-    needs: ['tag-release']
-    uses: ./.github/workflows/build-push.extensions.yml
-    if: needs.tag-release.outputs.previous-version != needs.tag-release.outputs.current-version
-    with:
-      ref: "refs/tags/v${{ needs.tag-release.outputs.current-version }}"
-    secrets: inherit
   call-build-push-migrations:
     name: Build tagged Migrations image
     needs: ['tag-release']
diff --git a/Dockerfile.extensions b/Dockerfile.extensions
deleted file mode 100644
index 0a753de4..00000000
--- a/Dockerfile.extensions
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM postgres:15
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && \
-        apt install -y gettext-base && \
-        rm -rf /var/lib/apt/lists/*
-
-WORKDIR /docker-entrypoint-initdb.d/
-
-COPY <<load.sh /docker-entrypoint-initdb.d/
-#!/bin/bash
-psql $\{CONNECTION_STRING_ROOT\} < /docker-entrypoint-initdb.d/extensions.sql
-load.sh
-
-RUN chmod +x /docker-entrypoint-initdb.d/load.sh
-
-COPY ./src/api-db-migrations/extensions.sql /docker-entrypoint-initdb.d/extensions.sql
-
-ENTRYPOINT ["/docker-entrypoint-initdb.d/load.sh"]
diff --git a/src/api-db-migrations/extensions.sql b/src/api-db-migrations/extensions.sql
deleted file mode 100644
index bc936ef0..00000000
--- a/src/api-db-migrations/extensions.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA public;
-CREATE EXTENSION IF NOT EXISTS postgis WITH SCHEMA public;

From a79bcc7d08878ec76e73a2effe24bf805eb2f0e3 Mon Sep 17 00:00:00 2001
From: jon r <jon@gnosis.io>
Date: Tue, 18 Jul 2023 21:55:13 +0200
Subject: [PATCH 2/2] APP-370: feat(package): increase build version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cda3cb51..8e92d966 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@o-platform/api-server",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "dist/index.js",
   "prepublish": "tsc",