[age] branch master updated: Fix docker build files (#1104)

[jgemignani]

This is an automated email from the ASF dual-hosted git repository.

jgemignani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/age.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d05a8eb Fix docker build files (#1104)
7d05a8eb is described below

commit 7d05a8eb1c6995b4a8e6ad0439aff5666a9425df
Author: Muhammad Taha Naveed <m.taha.navee...@gmail.com>
AuthorDate: Wed Jul 26 06:58:23 2023 +0500

    Fix docker build files (#1104)
    
    This PR contains fix for dockerhub image. It will trigger a new build for 
latest tag when merged.
---
 docker/Dockerfile     | 26 +++++++++++++++++++-------
 docker/Dockerfile.dev | 10 +++++++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c30d6931..ac9803d5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,15 +18,27 @@
 
 FROM postgres:14
 
-RUN apt-get update
-RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests 
\
-  bison \
-  build-essential \
-  flex \
-  postgresql-server-dev-14
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+       bison \
+       build-essential \
+       flex \
+       postgresql-server-dev-14 \
+       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
 
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 812aafd2..8162f5b5 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-14
+  postgresql-server-dev-14 \
+  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.