Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:21.04-smoketest-gosu into ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:13-21.04

  1. Git
  2. lp:~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql
  3. 21.04-smoketest-gosu
  4. Merge into 13-21.04
Proposed by Bryce Harrington
Status: Merged
Merged at revision: eebc4253f2440d45afec5aed701901f1962bf2bd
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:21.04-smoketest-gosu
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:13-21.04
Diff against target: 35 lines (+7/-2)
1 file modified
Dockerfile (+7/-2)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Canonical Server Pending
Review via email: mp+400149@code.launchpad.net

Description of the change

Add the review feedback from the 20.04 sync to the 21.04 branch as well.

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks. I wanted to check that it builds and tests fine, but of course we still can't build it :-(. Anyway, at least I double checked the syntax of the Dockerfile and everything looks good. LGTM, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index b9133f5..1e624d0 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -21,8 +21,10 @@ RUN set -eux; \
6 DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
7 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
8 locales \
9+ tzdata \
10+# Required by entrypoint script
11 gosu \
12- tzdata; \
13+ ; \
14 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8;
15 ENV LANG en_US.utf8
16
17@@ -53,6 +55,8 @@ RUN set -eux; \
18 # some of the steps above generate a lot of "*.pyc" files (and setting "PYTHONDONTWRITEBYTECODE" beforehand doesn't propagate properly for some reason), so we clean them up manually (as long as they aren't owned by a package)
19 # XXX check
20 find /usr -name '*.pyc' -type f -exec bash -c 'for pyc; do dpkg -S "$pyc" &> /dev/null || rm -vf "$pyc"; done' -- '{}' +; \
21+# smoke test
22+ gosu nobody true; \
23 # create manifest
24 mkdir -p /usr/share/rocks; \
25 (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query;
26@@ -75,7 +79,8 @@ ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
27 ENV PGDATA /var/lib/postgresql/data
28 # this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
29 # XXX check
30-RUN mkdir -p "$PGDATA"; \
31+RUN set -eux; \
32+ mkdir -p "$PGDATA"; \
33 chown -R postgres:postgres "$PGDATA"; \
34 chmod 777 "$PGDATA";
35 VOLUME /var/lib/postgresql/data

Subscribers

People subscribed via source and target branches

to all changes: