Skip to content

Update to Alpine 3.7 #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianon merged 1 commit into from
Apr 23, 2018
Merged

Update to Alpine 3.7 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 9.3/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7

# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
Expand Down Expand Up @@ -60,7 +60,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \
Expand Down
4 changes: 2 additions & 2 deletions 9.4/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7

# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
Expand Down Expand Up @@ -57,7 +57,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \
Expand Down
4 changes: 2 additions & 2 deletions 9.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7

# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
Expand Down Expand Up @@ -57,7 +57,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \
Expand Down
4 changes: 2 additions & 2 deletions 9.6/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7

# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
Expand Down Expand Up @@ -57,7 +57,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \
Expand Down
14 changes: 3 additions & 11 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ declare -A debianSuite=(
[9.6]='jessie'
[10]='stretch'
)
defaultAlpineVersion='3.7'
declare -A alpineVersion=(
[9.3]='3.5'
[9.4]='3.5'
[9.5]='3.5'
[9.6]='3.5'
[10]='3.7'
#[9.6]='3.5'
)

packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/'
Expand Down Expand Up @@ -83,13 +80,8 @@ for version in "${versions[@]}"; do
sed -e 's/%%PG_MAJOR%%/'"$version"'/g' \
-e 's/%%PG_VERSION%%/'"$srcVersion"'/g' \
-e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]}"'/g' \
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]:-$defaultAlpineVersion}"'/g' \
"Dockerfile-$variant.template" > "$version/$variant/Dockerfile"
if [ "${alpineVersion[$version]}" != '3.5' ]; then
# prove was moved out of the perl package and into perl-utils in 3.6
# https://pkgs.alpinelinux.org/contents?file=prove&path=&name=&branch=&repo=&arch=x86_64
sed -ri 's/(\s+perl)(\s+)/\1-utils\2/' "$version/$variant/Dockerfile"
fi
if [ "$majorVersion" = '9' ]; then
sed -i -e 's/WALDIR/XLOGDIR/g' \
-e 's/waldir/xlogdir/g' \
Expand Down