This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG11
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG11 by this push:
new 4b6bf214 Add locale configurations for docker image (#1115)
4b6bf214 is described below
commit 4b6bf2145d5fb22e792f8928469bbb490b33faad
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Tue Aug 1 03:15:55 2023 +0500
Add locale configurations for docker image (#1115)
Add locale configurations for docker image.
NOTE -
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 | 30 +++++++++++++++++++++---------
docker/Dockerfile.dev | 10 +++++++++-
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a681c7f3..d1fa827e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,15 +19,27 @@
FROM postgres:11-buster
-RUN apt-get update
-RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests
\
- bison \
- build-essential \
- flex \
- postgresql-server-dev-11
-
-COPY . /age
-RUN cd /age && make install
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends --no-install-suggests \
+ bison \
+ build-essential \
+ flex \
+ postgresql-server-dev-11 \
+ 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
+
+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
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 2a62131b..dbcc6630 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -24,8 +24,16 @@ RUN apt-get install --assume-yes --no-install-recommends
--no-install-suggests \
bison \
build-essential \
flex \
- postgresql-server-dev-11
+ postgresql-server-dev-11 \
+ 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.