From 604195806344431faf7309492f5a1df62618fc16 Mon Sep 17 00:00:00 2001 From: pgvishnuram <81585115+pgvishnuram@users.noreply.github.com> Date: Mon, 18 Jul 2022 21:09:53 +0530 Subject: [PATCH] Initial Commit to add po pgbouncer service (#354) --- .circleci/config.yml | 32 ++++++++++++++++++++++++++++++++ docker-compose.yaml | 5 +++++ po-pgbouncer/Dockerfile | 25 +++++++++++++++++++++++++ po-pgbouncer/test.yaml | 11 +++++++++++ po-pgbouncer/trivyignore | 3 +++ po-pgbouncer/version.txt | 1 + 6 files changed, 77 insertions(+) create mode 100644 po-pgbouncer/Dockerfile create mode 100644 po-pgbouncer/test.yaml create mode 100644 po-pgbouncer/trivyignore create mode 100644 po-pgbouncer/version.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index a37362ba..bee1fd6b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/docker-compose.yaml b/docker-compose.yaml index 0b4c63ca..dafcc7d5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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: diff --git a/po-pgbouncer/Dockerfile b/po-pgbouncer/Dockerfile new file mode 100644 index 00000000..5528580f --- /dev/null +++ b/po-pgbouncer/Dockerfile @@ -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 " + +ARG BUILD_NUMBER=-1 +LABEL io.astronomer.docker=true +LABEL io.astronomer.docker.build.number=$BUILD_NUMBER + +USER root +RUN apk upgrade +USER 100 \ No newline at end of file diff --git a/po-pgbouncer/test.yaml b/po-pgbouncer/test.yaml new file mode 100644 index 00000000..9f393b70 --- /dev/null +++ b/po-pgbouncer/test.yaml @@ -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" diff --git a/po-pgbouncer/trivyignore b/po-pgbouncer/trivyignore new file mode 100644 index 00000000..a1cc8553 --- /dev/null +++ b/po-pgbouncer/trivyignore @@ -0,0 +1,3 @@ +# Upstream prometheus images include several CVEs. +# We should try to remove these each time we update. + diff --git a/po-pgbouncer/version.txt b/po-pgbouncer/version.txt new file mode 100644 index 00000000..96e561b6 --- /dev/null +++ b/po-pgbouncer/version.txt @@ -0,0 +1 @@ +master-22