This is an automated email from the ASF dual-hosted git repository. jgemignani pushed a commit to branch PG15 in repository https://gitbox.apache.org/repos/asf/age.git
commit b2abfc469779ebc0e96e548ccd6afa06d0323dc3 Merge: 83a6e935 20fcc1df Author: John Gemignani <[email protected]> AuthorDate: Mon Jul 31 12:40:58 2023 -0700 Merge branch 'master' into PG15 Conflicts: docker/Dockerfile docker/Dockerfile | 26 ++++++++---- docker/Dockerfile.dev | 12 +++++- src/backend/parser/cypher_analyze.c | 8 ++++ src/backend/parser/cypher_clause.c | 25 ++++++++++++ src/backend/utils/adt/agtype.c | 77 +++++++++++++++++++++++++++++------- src/backend/utils/graph_generation.c | 2 +- 6 files changed, 125 insertions(+), 25 deletions(-) diff --cc docker/Dockerfile index 0178299a,ac9803d5..45298538 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@@ -16,17 -16,29 +16,29 @@@ # limitations under the License. # -FROM postgres:14 +FROM postgres:15 - RUN apt-get update - RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \ - bison \ - build-essential \ - flex \ - postgresql-server-dev-15 + RUN apt-get update \ + && apt-get install -y --no-install-recommends --no-install-suggests \ + bison \ + build-essential \ + flex \ - postgresql-server-dev-14 \ ++ postgresql-server-dev-15 \ + 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
