Skip to content

Commit 035f768

Browse files
committed
Correct Postgres 11
1 parent 34922de commit 035f768

File tree

9 files changed

+71
-12
lines changed

9 files changed

+71
-12
lines changed

.idea/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

11/Dockerfile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ RUN set -ex; \
7171
apt-key list
7272

7373
ENV PG_MAJOR 11
74-
ENV PG_VERSION 11.6-1.pgdg90+1
74+
ENV PG_VERSION 11.5-1+deb10u1
7575

7676
RUN set -ex; \
7777
\
@@ -82,22 +82,13 @@ RUN set -ex; \
8282
case "$dpkgArch" in \
8383
amd64|i386|ppc64el) \
8484
# arches officialy built by upstream
85-
echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
85+
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
8686
apt-get update; \
8787
;; \
8888
*) \
8989
# we're on an architecture upstream doesn't officially build for
9090
# let's build binaries from their published source packages
91-
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
92-
\
93-
case "$PG_MAJOR" in \
94-
9.* | 10 ) ;; \
95-
*) \
96-
# https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
97-
# TODO remove this once we hit buster+
98-
echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
99-
;; \
100-
esac; \
91+
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
10192
\
10293
tempDir="$(mktemp -d)"; \
10394
cd "$tempDir"; \

11/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
all: build
3+
4+
build:
5+
docker build -t moovement/postgis:11-2.5 .
6+
7+
update:
8+
echo "docker run --rm -v $$(pwd):/work -w /work buildpack-deps ./update.sh"
9+
10+
.PHONY: all build update

11/build_push_image.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5+
pushd "${PROJECT_ROOT}"
6+
: "${DOCKER_IMAGE:='moovement/postgres:11'}"
7+
: "${DOCKER_REGISTRY:='docker.moovement.co'}"
8+
: "${REPO:="${DOCKER_REGISTRY}/${DOCKER_IMAGE}"}"
9+
10+
docker build -t ${DOCKER_IMAGE} .
11+
#docker build -t moovement/postgres:11 .
12+
docker tag ${DOCKER_IMAGE} ${REPO}
13+
#docker tag moovement/postgres:11 docker.moovement.co/moovement/postgres:11
14+
#eval "$(aws ecr get-login --no-include-email --region "${AWS_REGION}")"
15+
docker push "${REPO}"
16+
#docker push docker.moovement.co/moovement/postgres:11
17+
#ecs deploy ${ECS_CLUSTER_NAME} ${ECS_SERVICE_NAME} --image ${ECS_CONTAINER_NAME} ${REPO} --timeout 6000
18+
popd

postgres.iml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="WEB_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$" />
6+
<orderEntry type="inheritedJdk" />
7+
<orderEntry type="sourceFolder" forTests="false" />
8+
</component>
9+
</module>

0 commit comments

Comments
 (0)