Skip to content

Commit 4b49242

Browse files
Update CI
1 parent ce8362c commit 4b49242

File tree

4 files changed

+12
-59
lines changed

4 files changed

+12
-59
lines changed

.github/workflows/docker-branch.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ on:
1616
required: true
1717

1818
env:
19-
ORG: timescaledev
20-
TS_VERSION: ${{ github.event.inputs.branch }}
19+
ORG: samagragovernance
20+
TS_VERSION: main
2121
PLATFORM: linux/amd64
2222

2323
jobs:
@@ -48,6 +48,6 @@ jobs:
4848
- name: Login to DockerHub Registry
4949
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USER }} --password-stdin
5050

51-
- name: Build and push nightly Docker image for TimescaleDB
52-
run: make multi ORG=$ORG PG_VER=pg${{ matrix.pg }} TS_VERSION="${TS_VERSION}" PLATFORM=$PLATFORM TAG="-t timescaledev/timescaledb:branch-${TS_VERSION}-pg${{ matrix.pg }}"
51+
- name: Build and push nightly Docker image for Postgres
52+
run: make multi ORG=$ORG PG_VER=pg${{ matrix.pg }} TS_VERSION="${TS_VERSION}" PLATFORM=$PLATFORM TAG="-t samagragovernance/postgres:branch-${TS_VERSION}-pg${{ matrix.pg }}"
5353

.github/workflows/docker-image.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ on:
1515
required: false
1616
default: false
1717
env:
18-
ORG: timescale #timescaledev
19-
TS_VERSION: ${{ github.event.inputs.version || '2.10.0' }}
18+
ORG: samagragovernance
19+
TS_VERSION: main
2020
jobs:
2121

2222
# Build multi-arch TimescaleDB images for both TSL and OSS code.
23-
timescaledb:
23+
postgres:
2424

2525
name: PG${{ matrix.pg }}${{ matrix.oss }}
2626
runs-on: ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
4747
- name: Login to DockerHub Registry
4848
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USER }} --password-stdin
4949

50-
- name: Build and push multi-platform Docker image for TimescaleDB
50+
- name: Build and push multi-platform Docker image for postgres
5151
run: |
5252
if [ "${{ github.event.inputs.no_tag_latest }}" == "true" ]
5353
then
@@ -76,9 +76,6 @@ jobs:
7676

7777
- name: Build and push amd64 Docker image for TimescaleDB bitnami
7878
run: |
79-
if [ "${{ github.event.inputs.no_tag_latest }}" == "true" ]
80-
then
81-
export BETA=1
82-
fi
79+
export BETA=1
8380
make push ORG=$ORG PG_VER=pg${{ matrix.pg }} TS_VERSION=$TS_VERSION BETA=$BETA
8481
working-directory: bitnami

.github/workflows/docker-nightly-build.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
NAME=timescaledb
1+
NAME=postgres
22
# Default is to timescaledev to avoid unexpected push to the main repo
33
# Set ORG to timescale in the caller
4-
ORG=timescaledev
4+
ORG=samagragovernance
55
PG_VER=pg15
66
PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
77
TS_VERSION=main
88
PREV_TS_VERSION=$(shell wget --quiet -O - https://raw.githubusercontent.com/timescale/timescaledb/${TS_VERSION}/version.config | grep update_from_version | sed -e 's!update_from_version = !!')
9-
PREV_TS_IMAGE="timescale/timescaledb:$(PREV_TS_VERSION)-pg$(PG_VER_NUMBER)$(PREV_EXTRA)"
9+
PREV_TS_IMAGE="samagragovernance/postgres:$(PREV_TS_VERSION)-pg$(PG_VER_NUMBER)$(PREV_EXTRA)"
1010
PREV_IMAGE=$(shell if docker pull $(PREV_TS_IMAGE) >/dev/null; then echo "$(PREV_TS_IMAGE)"; else echo "postgres:$(PG_VER_NUMBER)-alpine"; fi )
1111
# Beta releases should not be tagged as latest, so BETA is used to track.
1212
BETA=$(findstring rc,$(TS_VERSION))

0 commit comments

Comments
 (0)