Skip to content

Commit

Permalink
Initial Commit to add po pgbouncer service (#354)
Browse files Browse the repository at this point in the history
  • Loading branch information
pgvishnuram authored Jul 18, 2022
1 parent 18e2fc0 commit 6041958
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 0 deletions.
32 changes: 32 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,38 @@ workflows:
branches:
only: main

- approve-po-pgbouncer:
type: approval
- build:
name: build-po-pgbouncer
directory: po-pgbouncer
requires:
- approve-po-pgbouncer
- run_pre_commit
- test:
name: test-po-pgbouncer
directory: po-pgbouncer
test_script: bin/test.py
test_requirements: requirements/test-requirements.txt
requires:
- build-po-pgbouncer
- scan-trivy:
name: scan-trivy-po-pgbouncer
directory: po-pgbouncer
requires:
- test-po-pgbouncer
- release:
name: release-po-pgbouncer
directory: po-pgbouncer
context:
- quay.io
- docker.io
requires:
- scan-trivy-po-pgbouncer
filters:
branches:
only: main

- approve-postgres-exporter:
type: approval
- build:
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ services:
build:
context: pgbouncer-exporter
entrypoint: "top"
ap-po-pgbouncer:
image: ap-po-pgbouncer:${ASTRO_IMAGE_TAG:-latest}
build:
context: po-pgbouncer
entrypoint: "/bin/sleep 1m"
ap-postgres-exporter:
image: ap-postgres-exporter:${ASTRO_IMAGE_TAG:-latest}
build:
Expand Down
25 changes: 25 additions & 0 deletions po-pgbouncer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# Copyright 2016 Astronomer Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM registry.opensource.zalan.do/acid/pgbouncer:master-22
LABEL maintainer="Astronomer <[email protected]>"

ARG BUILD_NUMBER=-1
LABEL io.astronomer.docker=true
LABEL io.astronomer.docker.build.number=$BUILD_NUMBER

USER root
RUN apk upgrade
USER 100
11 changes: 11 additions & 0 deletions po-pgbouncer/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
tests:
root_user_test: True
default_user: pgbouncer
users_config:
- name: pgbouncer
group: nogroup
gid: 65533
uid: 100
docker:
entrypoint: "/bin/sleep 1m"
3 changes: 3 additions & 0 deletions po-pgbouncer/trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Upstream prometheus images include several CVEs.
# We should try to remove these each time we update.

1 change: 1 addition & 0 deletions po-pgbouncer/version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
master-22

0 comments on commit 6041958

Please sign in to comment.