Skip to content
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.

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

Upgrade to Alpine 3.11 #657

Merged
merged 4 commits into from
Jan 29, 2020
Merged

Upgrade to Alpine 3.11 #657

merged 4 commits into from
Jan 29, 2020

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Dec 20, 2019

No description provided.

@tianon
Copy link
Member

tianon commented Dec 20, 2019

Looks like we need to replicate https://gitlab.alpinelinux.org/alpine/aports/blob/840f665bfeaa4de03d66d8a6d69ceb3a331e3bf6/main/postgresql/postgresql.pre-install now that our postgres user is not part of alpine-baselayout. 😅
(Similar to https://github.com/docker-library/php/blob/bb80b576dd6da2fd73760f5dd3a3a89980805703/Dockerfile-alpine.template#L25-L32)

Do you think there's a version of Alpine/musl where #582 might become relevant for Alpine variants as well?

@yosifkit
Copy link
Member

Looks like we are getting two versions of llvm-libs and so the build is confused. clang is the problem, since it is newer and depends on llvm9-libs. I guess swap everything to llvm9?

(40/61) Installing llvm8-libs (8.0.1-r2)
(41/61) Installing llvm8 (8.0.1-r2)
(42/61) Installing llvm8-dev (8.0.1-r2)
(43/61) Installing llvm9-libs (9.0.0-r1)

@J0WI
Copy link
Contributor Author

J0WI commented Dec 23, 2019

Do you think there's a version of Alpine/musl where #582 might become relevant for Alpine variants as well?

I'm not aware of any breaking changes in musl-libc, but I haven't tested all cases myself.

@tianon
Copy link
Member

tianon commented Dec 23, 2019

Ok, cool. 👍

(I also did a little digging and couldn't find anything that made me believe this was a problem for this bump, but it's still possible in the future. Hopefully some of the ideas in https://wiki.postgresql.org/wiki/Collations get better traction so this can be a non-issue for future PostgreSQL versions via ICU or the like. 👍)

# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable
RUN set -eux; \
addgroup -g 70 -S postgres; \
adduser -u 70 -S -D -G postgres postgres; \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should also set /var/lib/postgresql as the home directory here, like we do in Debian:

useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \

(and like Alpine has done previously and still does in https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.11-stable)

@smellman
Copy link

Why this PR is not merged?

Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay; looks good, thanks! 👍

@tianon tianon merged commit 55e3dc0 into docker-library:master Jan 29, 2020
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jan 30, 2020
Changes:

- docker-library/postgres@55e3dc0: Merge pull request docker-library/postgres#657 from J0WI/alpine11
- docker-library/postgres@c4b0195: Add home dir
- docker-library/postgres@52814ab: Bump LLVM to 9
- docker-library/postgres@ada31ea: Add postgres directory and user
- docker-library/postgres@1cbd3a1: Upgrade to Alpine 3.11
@J0WI J0WI deleted the alpine11 branch January 31, 2020 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants