Skip to content

Commit bcec7e9

Browse files
committed
Use Postgres 12.4
1 parent 7b01d6f commit bcec7e9

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@ ARG pg_full_version
88
# Install dependencies
99
#--------------------------------------------------------------------------------
1010
# "postgresql" is required for "pg_restore"
11-
# "py-pip" is required for "aws-cli"
1211
#--------------------------------------------------------------------------------
1312
RUN echo "http://dl-cdn.alpinelinux.org/alpine/v${alpine_version}/main" >> /etc/apk/repositories
14-
15-
RUN apk --no-cache --update add dumb-init postgresql=${pg_full_version} py-pip && \
16-
pip install awscli && \
17-
apk --purge -v del py-pip
13+
RUN apk --no-cache --update add dumb-init postgresql=${pg_full_version} aws-cli
1814

1915
#--------------------------------------------------------------------------------
2016
# Set script permissions and create required directories

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Cron based download from s3 and database restore.
66

77
`./build_push.sh [-p <FILE>, --package <FILE>]`
88

9-
`./build_push.sh -p 11.7-3.9`
9+
`./build_push.sh -p 12.4-3.12`
1010

1111
### Package files
1212

action.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ if [ -n "$PRE_RESTORE_PSQL" ]; then
100100
fi
101101

102102
if [ -n "$SCHEMA" ]; then
103-
printf '%s' " pg_restore --jobs $(grep -c ^processor /proc/cpuinfo) --schema $SCHEMA --no-owner -d <DATABASE_URL> /cache/${dump_file}"
103+
printf '\n%s' " pg_restore --jobs $(grep -c ^processor /proc/cpuinfo) --schema $SCHEMA --no-owner -d <DATABASE_URL> /cache/${dump_file}"
104104
pg_restore --jobs "$(grep -c ^processor /proc/cpuinfo)" --schema "$SCHEMA" --no-owner -d "${DATABASE_URL}" "/cache/${dump_file}"
105105
else
106-
printf '%s' " pg_restore --jobs $(grep -c ^processor /proc/cpuinfo) --no-owner -d <DATABASE_URL> /cache/${dump_file}"
106+
printf '\n%s' " pg_restore --jobs $(grep -c ^processor /proc/cpuinfo) --no-owner -d <DATABASE_URL> /cache/${dump_file}"
107107
pg_restore --jobs "$(grep -c ^processor /proc/cpuinfo)" --no-owner -d "${DATABASE_URL}" "/cache/${dump_file}"
108108
fi
109109

package/12.4-3.12.env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALPINE_VERSION='3.12'
2+
PG_LATEST=false
3+
PG_BASE_VERSION='12'
4+
PG_FULL_VERSION='12.4'

0 commit comments

Comments
 (0)