Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bitnami workflow #294

Merged
merged 1 commit into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions .github/workflows/bitnami.yml

This file was deleted.

23 changes: 1 addition & 22 deletions .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,13 @@ jobs:
matrix:
pg: [14, 15, 16, 17]
type: ['normal']
include:
- pg: 17
type: 'bitnami'
steps:
- name: Check out the source
uses: actions/checkout@v4

- name: Build Docker Image for TimescaleDB
run: |

if [ ${{ matrix.type }} == bitnami ]
then
cd bitnami
make image PG_BASE_IMAGE=postgresql PG_VER=pg${{ matrix.pg }} TAG_VERSION=smoketest-image BETA=1
elif [ ${{ matrix.type }} == repmgr-bitnami ]
then
cd bitnami
make image PG_BASE_IMAGE=postgresql-repmgr PG_VER=pg${{ matrix.pg }} TAG_VERSION=smoketest-image BETA=1
else
make image PG_VER=pg${{ matrix.pg }} TAG_VERSION=smoketest-image BETA=1
fi
make image PG_VER=pg${{ matrix.pg }} TAG_VERSION=smoketest-image BETA=1

- name: Install psql
run: sudo apt install postgresql-client
Expand All @@ -54,13 +40,6 @@ jobs:
docker container rm smoketest-container || true
docker run -d -p 5432:5432 \
-e POSTGRES_PASSWORD=${PGPASSWORD} \
-e REPMGR_PASSWORD=${PGPASSWORD} \
-e REPMGR_PRIMARY_HOST=localhost \
-e REPMGR_PRIMARY_PORT=5432 \
-e REPMGR_PARTNER_NODES=pg-0,pg-1 \
-e REPMGR_NODE_NAME=pg-0 \
-e REPMGR_NODE_NETWORK_NAME=localhost \
-e REPMGR_PORT_NUMBER=5432 \
--name smoketest-container smoketest-image
for _ in {1..120}
do
Expand Down
2 changes: 0 additions & 2 deletions bitnami/.dockerignore

This file was deleted.

117 changes: 0 additions & 117 deletions bitnami/Dockerfile

This file was deleted.

42 changes: 0 additions & 42 deletions bitnami/Makefile

This file was deleted.

22 changes: 0 additions & 22 deletions bitnami/timescaledb-bitnami-entrypoint.sh

This file was deleted.

19 changes: 0 additions & 19 deletions docker-entrypoint-initdb.d/000_install_timescaledb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,6 @@

create_sql=`mktemp`

# Checks to support bitnami image with same scripts so they stay in sync
if [ ! -z "${BITNAMI_APP_NAME:-}" ]; then
if [ -z "${POSTGRES_USER:-}" ]; then
POSTGRES_USER=postgres
fi

if [ -z "${POSTGRESQL_PASSWORD:-}" ]; then
POSTGRESQL_PASSWORD=${POSTGRESQL_POSTGRES_PASSWORD}
fi

if [ -z "${POSTGRES_DB:-}" ]; then
POSTGRES_DB=${POSTGRESQL_DATABASE}
fi

if [ -z "${PGDATA:-}" ]; then
PGDATA=${POSTGRESQL_DATA_DIR}
fi
fi

if [ -z "${POSTGRESQL_CONF_DIR:-}" ]; then
POSTGRESQL_CONF_DIR=${PGDATA}
fi
Expand Down
Loading