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 0c087bee [PG11] docker: add Dockerfile.dev & move docker-related files
to "docker/" (#1066)
0c087bee is described below
commit 0c087bee7173a87a0559d155e2f3a7042652f3ea
Author: Panagiotis Foliadis <[email protected]>
AuthorDate: Thu Jul 20 19:13:28 2023 +0300
[PG11] docker: add Dockerfile.dev & move docker-related files to "docker/"
(#1066)
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 <[email protected]>
---
.dockerignore | 9 +++++++++
Dockerfile => docker/Dockerfile | 2 +-
Dockerfile => docker/Dockerfile.dev | 18 +++++++++++++-----
.../00-create-extension-age.sql | 0
4 files changed, 23 insertions(+), 6 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 89%
copy from Dockerfile
copy to docker/Dockerfile
index 11d882b2..a681c7f3 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -29,6 +29,6 @@ RUN apt-get install --assume-yes --no-install-recommends
--no-install-suggests \
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
+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/Dockerfile b/docker/Dockerfile.dev
similarity index 75%
rename from Dockerfile
rename to docker/Dockerfile.dev
index 11d882b2..2a62131b 100644
--- a/Dockerfile
+++ b/docker/Dockerfile.dev
@@ -19,16 +19,24 @@
FROM postgres:11-buster
-RUN apt-get update
+RUN apt-get update
RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests
\
bison \
build-essential \
flex \
- postgresql-server-dev-11
+ postgresql-server-dev-11
-COPY . /age
-RUN cd /age && make install
+COPY . /age
-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
