[age] branch master updated: docker: add Dockerfile.dev & move docker-related files to "docker/" (#943)

[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 10fe47c0 docker: add Dockerfile.dev & move docker-related files to 
"docker/" (#943)
10fe47c0 is described below

commit 10fe47c0fcb78903b99b810e7194017c1334d491
Author: Panagiotis Foliadis <pfolia...@hotmail.com>
AuthorDate: Wed Jul 19 19:10:49 2023 +0300

    docker: add Dockerfile.dev & move docker-related files to "docker/" (#943)
    
    Dockerfile.dev:
      This variation of the original Dockerfile is introduced to
      help developers run their testsuite in the build phase of the
      docker image.
    .dockerignore:
      Added .dockerignore to avoid conflicts with ".so" files
    
    Signed-off-by: Panagiotis Foliadis <pfolia...@hotmail.com>
---
 .dockerignore                                             |  9 +++++++++
 Dockerfile => docker/Dockerfile                           |  0
 Dockerfile => docker/Dockerfile.dev                       | 15 ++++++++++++---
 .../00-create-extension-age.sql                           |  0
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..660286b0
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+*.o
+*.so
+.gitignore
+build.sh
+.idea
+.deps
+.DS_Store
+*.tokens
+*.interp
\ No newline at end of file
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
copy from Dockerfile
copy to docker/Dockerfile
diff --git a/Dockerfile b/docker/Dockerfile.dev
similarity index 77%
rename from Dockerfile
rename to docker/Dockerfile.dev
index 031946c8..fe40788e 100644
--- a/Dockerfile
+++ b/docker/Dockerfile.dev
@@ -16,7 +16,8 @@
 # limitations under the License.
 #
 
-FROM postgres:13
+
+FROM postgres:13-buster
 
 RUN apt-get update
 RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests 
\
@@ -26,8 +27,16 @@ RUN apt-get install --assume-yes --no-install-recommends 
--no-install-suggests \
   postgresql-server-dev-13
 
 COPY . /age
-RUN cd /age && make install
 
-COPY docker-entrypoint-initdb.d/00-create-extension-age.sql 
/docker-entrypoint-initdb.d/00-create-extension-age.sql
+# Set current working directory to /age/ and build.
+WORKDIR /age
+RUN make install
+
+RUN chown -R postgres /age
+USER postgres
+
+RUN make installcheck
+
+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"]
diff --git a/docker-entrypoint-initdb.d/00-create-extension-age.sql 
b/docker/docker-entrypoint-initdb.d/00-create-extension-age.sql
similarity index 100%
rename from docker-entrypoint-initdb.d/00-create-extension-age.sql
rename to docker/docker-entrypoint-initdb.d/00-create-extension-age.sql