Skip to content

Commit 097b78e

Browse files
author
sergey grinko
committed
синхронизация с локальной веткой разработки
1 parent 26f31e3 commit 097b78e

154 files changed

Lines changed: 1327 additions & 1160 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎12/analyze-service.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ services:
1515
STAT_STATEMENTS: "true"
1616
# TZ: "Etc/UTC"
1717
TZ: "Europe/Moscow"
18-
PGPASSWORD: "qweasdzxc"
19-
# PGHOST: "10.10.2.139"
20-
PGHOST: "postgres"
21-
PGPORT: "5432"
22-
PGBHOST: "pgbouncer"
23-
PGBPORT: "6432"
18+
PGPASSWORD: qweasdzxc
19+
# PGHOST: 10.10.2.139
20+
PGHOST: postgres
21+
PGPORT: 5432
22+
PGBHOST: pgbouncer
23+
PGBPORT: 6432

‎12/backup-service.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.5'
22
services:
33

4-
pgprobackup_backup:
4+
pgprobackup:
55
build:
66
context: ./docker-pgprobackup
77
dockerfile: Dockerfile
@@ -12,8 +12,8 @@ services:
1212

1313
environment:
1414
TZ: "Europe/Moscow"
15-
PGHOST: "postgres"
16-
PGPORT: "5432"
15+
PGHOST: postgres
16+
PGPORT: 5432
1717
# PGUSER: "postgres"
1818
# PGPASSWORD: "qweasdzxc"
1919
EMAILTO: "DBA-PostgreSQL@company.ru"

‎12/bin/docker_build.sh‎

Lines changed: 24 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,29 @@
11
#!/bin/bash
2+
#
3+
# получает через пробел имена контейнеров для сборки. Если не указано, то принимается такая строка:
4+
# pgbouncer postgres pgupgrade analyze mamonsu pgprobackup pgprorestore
5+
#
26
VERSION=12
37

48
set -euo pipefail
59

6-
cd docker-pgbouncer
7-
dir=`pwd`
8-
echo ""
9-
echo "====================================="
10-
echo " $dir"
11-
echo "====================================="
12-
echo ""
13-
docker build . -t ${VERSION}_pgbouncer:latest
14-
cd ..
15-
16-
cd docker-postgres
17-
dir=`pwd`
18-
echo ""
19-
echo "====================================="
20-
echo " $dir"
21-
echo "====================================="
22-
echo ""
23-
docker build . -t ${VERSION}_postgres:latest
24-
cd ..
25-
26-
cd docker-analyze
27-
dir=`pwd`
28-
echo ""
29-
echo "====================================="
30-
echo " $dir"
31-
echo "====================================="
32-
echo ""
33-
docker build . -t ${VERSION}_analyze:latest
34-
cd ..
35-
36-
cd docker-mamonsu
37-
dir=`pwd`
38-
echo ""
39-
echo "====================================="
40-
echo " $dir"
41-
echo "====================================="
42-
echo ""
43-
docker build . -t ${VERSION}_mamonsu:latest
44-
cd ..
45-
46-
cd docker-pgprobackup
47-
dir=`pwd`
48-
echo ""
49-
echo "====================================="
50-
echo " $dir"
51-
echo "====================================="
52-
echo ""
53-
docker build . -t ${VERSION}_pgprobackup_backup:latest
54-
cd ..
55-
56-
cd docker-pgprorestore
57-
dir=`pwd`
58-
echo ""
59-
echo "====================================="
60-
echo " $dir"
61-
echo "====================================="
62-
echo ""
63-
docker build . -t ${VERSION}_pgprobackup_restore:latest
64-
cd ..
65-
66-
docker image ls
10+
if [[ $# -ne 0 ]]; then
11+
LISTDOCKER=$@
12+
else
13+
LISTDOCKER="pgbouncer postgres pgupgrade analyze mamonsu pgprobackup pgprorestore"
14+
fi
15+
16+
for param in $LISTDOCKER
17+
do
18+
cd docker-$param
19+
dir=`pwd`
20+
echo ""
21+
echo "====================================="
22+
echo " $dir"
23+
echo "====================================="
24+
echo ""
25+
docker build --no-cache . -t ${VERSION}_$param:latest
26+
cd ..
27+
done
28+
29+
docker image ls --all

‎12/bin/docker_start.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
#!/bin/bash
12
docker run -p 127.0.0.1:5433:5432/tcp --shm-size 2147483648 \
23
-e POSTGRES_PASSWORD=postgres \
34
-e POSTGRES_HOST_AUTH_METHOD=trust \
45
-e DEPLOY_PASSWORD=postgres \
56
-e TZ="Etc/UTC" \
6-
grufos/postgres:12.14 \
7+
grufos/postgres:12.17 \
78
-c shared_preload_libraries="plugin_debugger,plpgsql_check,pg_stat_statements,auto_explain,pg_buffercache,pg_cron,shared_ispell,pg_prewarm" \
89
-c shared_ispell.max_size=70MB

‎12/bin/harbor_push.sh‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/bash
2+
VERSION=12
3+
MINOR=17
4+
VERS_BOUNCER="1.20.1"
5+
VERS_PROBACKUP="2.5.13"
6+
VERS_MAMONSU="3.5.5"
7+
PROJECT=dba_postgres
8+
URL=harbor.company.ru
9+
ACCOUNT="${URL}/${PROJECT}"
10+
LATEST_PUSH='no'
11+
12+
set -euo pipefail
13+
14+
if [[ $# -ne 0 ]]; then
15+
LISTDOCKER=$@
16+
else
17+
LISTDOCKER="pgbouncer postgres pgupgrade analyze mamonsu pgprobackup pgprorestore"
18+
fi
19+
20+
for param in $LISTDOCKER
21+
do
22+
if [ "$param" = "pgbouncer" ]; then
23+
vers="${VERS_BOUNCER}"
24+
elif [ "$param" = "mamonsu" ]; then
25+
vers="${VERSION}_${VERS_MAMONSU}"
26+
elif [[ "$param" = "pgprobackup" || $param = "pgprorestore" ]]; then
27+
vers="${VERSION}.${MINOR}_${VERS_PROBACKUP}"
28+
else
29+
vers="${VERSION}.${MINOR}"
30+
fi
31+
echo "======================="
32+
echo "${param} -> ${vers}"
33+
echo "======================="
34+
if ! docker image ls | grep "${ACCOUNT}/${param}" ; then
35+
echo " push ..."
36+
docker tag ${VERSION}_${param}:latest ${ACCOUNT}/${param}:latest
37+
if [ "$LATEST_PUSH" = "yes" ]; then
38+
docker push ${ACCOUNT}/${param}:latest
39+
fi
40+
docker tag ${ACCOUNT}/${param}:latest ${ACCOUNT}/${param}:${vers}
41+
docker push ${ACCOUNT}/${param}:${vers}
42+
fi
43+
done

‎12/bin/hub_push.sh‎

Lines changed: 34 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,41 @@
11
#!/bin/bash
22
VERSION=12
3-
MINOR=16
3+
MINOR=17
4+
VERS_BOUNCER="1.20.1"
5+
VERS_PROBACKUP="2.5.13"
6+
VERS_MAMONSU="3.5.5"
7+
ACCOUNT=grufos
8+
LATEST_PUSH='no'
49

510
set -euo pipefail
611

7-
# pgbouncer
8-
#echo "========="
9-
#echo "pgbouncer"
10-
#echo "========="
11-
#if ! docker image ls | grep "grufos/pgbouncer" ; then
12-
# echo " push ..."
13-
# docker tag ${VERSION}_pgbouncer:latest grufos/pgbouncer:latest
14-
# docker push grufos/pgbouncer:latest
15-
# docker tag grufos/pgbouncer:latest grufos/pgbouncer:1.19.0
16-
# docker push grufos/pgbouncer:1.19.0
17-
#fi
18-
19-
# postgres
20-
echo "========"
21-
echo "postgres"
22-
echo "========"
23-
if ! docker image ls | grep "grufos/postgres" ; then
24-
echo " push ..."
25-
docker tag ${VERSION}_postgres:latest grufos/postgres:latest
26-
# docker push grufos/postgres:latest
27-
docker tag grufos/postgres:latest grufos/postgres:${VERSION}.${MINOR}
28-
docker push grufos/postgres:${VERSION}.${MINOR}
29-
fi
30-
31-
# pganalyze
32-
echo "========="
33-
echo "pganalyze"
34-
echo "========="
35-
if ! docker image ls | grep "grufos/pganalyze" ; then
36-
echo " push ..."
37-
docker tag ${VERSION}_analyze:latest grufos/pganalyze:latest
38-
# docker push grufos/pganalyze:latest
39-
docker tag grufos/pganalyze:latest grufos/pganalyze:${VERSION}.${MINOR}
40-
docker push grufos/pganalyze:${VERSION}.${MINOR}
41-
fi
42-
43-
# pgprobackup
44-
echo "==========="
45-
echo "pgprobackup"
46-
echo "==========="
47-
if ! docker image ls | grep "grufos/pgprobackup" ; then
48-
echo " push ..."
49-
docker tag ${VERSION}_pgprobackup_backup:latest grufos/pgprobackup:latest
50-
# docker push grufos/pgprobackup:latest
51-
docker tag grufos/pgprobackup:latest grufos/pgprobackup:${VERSION}.${MINOR}_2.5.12
52-
docker push grufos/pgprobackup:${VERSION}.${MINOR}_2.5.12
53-
fi
54-
55-
# pgprorestore
56-
echo "============"
57-
echo "pgprorestore"
58-
echo "============"
59-
if ! docker image ls | grep "grufos/pgprorestore" ; then
60-
echo " push ..."
61-
docker tag ${VERSION}_pgprobackup_restore:latest grufos/pgprorestore:latest
62-
# docker push grufos/pgprorestore:latest
63-
docker tag grufos/pgprorestore:latest grufos/pgprorestore:${VERSION}.${MINOR}_2.5.12
64-
docker push grufos/pgprorestore:${VERSION}.${MINOR}_2.5.12
12+
if [[ $# -ne 0 ]]; then
13+
LISTDOCKER=$@
14+
else
15+
LISTDOCKER="pgbouncer postgres pgupgrade analyze mamonsu pgprobackup pgprorestore"
6516
fi
6617

67-
# mamonsu
68-
echo "======="
69-
echo "mamonsu"
70-
echo "======="
71-
if ! docker image ls | grep "grufos/mamonsu" ; then
72-
echo " push ..."
73-
docker tag ${VERSION}_mamonsu:latest grufos/mamonsu:latest
74-
# docker push grufos/mamonsu:latest
75-
docker tag grufos/mamonsu:latest grufos/mamonsu:${VERSION}_3.5.5
76-
docker push grufos/mamonsu:${VERSION}_3.5.5
77-
fi
18+
for param in $LISTDOCKER
19+
do
20+
if [ "$param" = "pgbouncer" ]; then
21+
vers="${VERS_BOUNCER}"
22+
elif [ "$param" = "mamonsu" ]; then
23+
vers="${VERSION}_${VERS_MAMONSU}"
24+
elif [[ "$param" = "pgprobackup" || $param = "pgprorestore" ]]; then
25+
vers="${VERSION}.${MINOR}_${VERS_PROBACKUP}"
26+
else
27+
vers="${VERSION}.${MINOR}"
28+
fi
29+
echo "======================="
30+
echo "${param} -> ${vers}"
31+
echo "======================="
32+
if ! docker image ls | grep "${ACCOUNT}/${param}" ; then
33+
echo " push ..."
34+
docker tag ${VERSION}_${param}:latest ${ACCOUNT}/${param}:latest
35+
if [ "$LATEST_PUSH" = "yes" ]; then
36+
docker push ${ACCOUNT}/${param}:latest
37+
fi
38+
docker tag ${ACCOUNT}/${param}:latest ${ACCOUNT}/${param}:${vers}
39+
docker push ${ACCOUNT}/${param}:${vers}
40+
fi
41+
done

‎12/bin/postgres_start.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ mkdir -p /mnt/pgbak2 /var/log/postgresql1 /var/log/pgbouncer1 /var/log/mamonsu1
44
chown 999:999 /var/log/postgresql1 /var/lib/pgsql/12_1 /var/log/pgbouncer1 /var/log/mamonsu1 /mnt/pgbak2 /usr/share/postgres/12_1 /usr/share/postgres/12_1/tsearch_data
55
clear
66
# запускаем сборку
7-
rm -rf /var/log/postgresql/*
7+
rm -rf /var/log/postgresql1/*
88
docker-compose -f "postgres-service.yml" up --build "$@"

‎12/bin/postgres_start_all.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ mkdir -p /mnt/pgbak2 /var/log/postgresql1 /var/log/pgbouncer1 /var/log/mamonsu1
44
chown 999:999 /var/log/postgresql1 /var/lib/pgsql/12_1 /var/log/pgbouncer1 /var/log/mamonsu1 /mnt/pgbak2 /usr/share/postgres/12_1 /usr/share/postgres/12_1/tsearch_data
55
clear
66
# запускаем сборку
7-
rm -rf /var/log/pgbouncer/*
8-
rm -rf /var/log/postgresql/*
9-
rm -rf /var/log/mamonsu/*
7+
rm -rf /var/log/pgbouncer1/*
8+
rm -rf /var/log/postgresql1/*
9+
rm -rf /var/log/mamonsu1/*
10+
rm -rf /etc/pgbouncer1/*
1011
docker-compose -f "postgres-service_all.yml" up --build "$@"

‎12/bin/postgres_start_pgb.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ clear
77
rm -rf /var/log/pgbouncer1/*
88
rm -rf /var/log/postgresql1/*
99
rm -rf /var/log/mamonsu1/*
10+
rm -rf /etc/pgbouncer1/*
1011
docker-compose -f "postgres-service_pgb.yml" up --build "$@"

‎12/docker-analyze/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Based on:
22
# https://hub.docker.com/_/debian
33
#
4-
FROM debian:bullseye-slim
4+
FROM debian:bookworm-slim
55

66
LABEL maintainer="Sergey Grinko <sergey.grinko@gmail.com>"
77

8-
ENV DEBIAN_RELEASE bullseye
8+
ENV DEBIAN_RELEASE bookworm
99
ENV PG_MAJOR 12
1010
ENV BACKUP_PATH /mnt/pgbak
1111

0 commit comments

Comments
 (0)