This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG13
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG13 by this push:
new 955df1e8 Add locale configurations for docker image (#1117)
955df1e8 is described below
commit 955df1e81487dcfecd8f2e84b84648af3448cd04
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Tue Aug 1 04:34:09 2023 +0500
Add locale configurations for docker image (#1117)
- This will trigger a new build for docker image. Another PR will be
followed by this one that will set the CIs for the target branch of
this PR. That PR will also serve as a test for the new docker image
build.
---
docker/Dockerfile | 28 ++++++++++++++++++++--------
docker/Dockerfile.dev | 12 ++++++++++--
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3537d02c..278dddb2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,16 +18,28 @@
FROM postgres:13
-RUN apt-get update
-RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests
\
- bison \
- build-essential \
- flex \
- postgresql-server-dev-13
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends --no-install-suggests \
+ bison \
+ build-essential \
+ flex \
+ postgresql-server-dev-13 \
+ locales
+
+ENV LANG=en_US.UTF-8
+ENV LC_COLLATE=en_US.UTF-8
+ENV LC_CTYPE=en_US.UTF-8
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+ && locale-gen \
+ && update-locale LANG=en_US.UTF-8
COPY . /age
-RUN cd /age && make install
+
+WORKDIR /age
+
+RUN make && make install
COPY docker/docker-entrypoint-initdb.d/00-create-extension-age.sql
/docker-entrypoint-initdb.d/00-create-extension-age.sql
-CMD ["postgres", "-c", "shared_preload_libraries=age"]
+CMD ["postgres", "-c", "shared_preload_libraries=age"]
\ No newline at end of file
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index fe40788e..e5db3eba 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -17,15 +17,23 @@
#
-FROM postgres:13-buster
+FROM postgres:13
RUN apt-get update
RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests
\
bison \
build-essential \
flex \
- postgresql-server-dev-13
+ postgresql-server-dev-13 \
+ locales
+ENV LANG=en_US.UTF-8
+ENV LC_COLLATE=en_US.UTF-8
+ENV LC_CTYPE=en_US.UTF-8
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+ && locale-gen \
+ && update-locale LANG=en_US.UTF-8
COPY . /age
# Set current working directory to /age/ and build.
