This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch PG12
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG12 by this push:
new cf13e3dd [PG12] docker: add Dockerfile.dev & move docker-related files
to "docker/" (#1068)
cf13e3dd is described below
commit cf13e3dd749f65916278861a382bb513927f565b
Author: Panagiotis Foliadis <[email protected]>
AuthorDate: Fri Jul 21 00:47:09 2023 +0300
[PG12] docker: add Dockerfile.dev & move docker-related files to "docker/"
(#1068)
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 | 15 ++++++++++++---
.../00-create-extension-age.sql | 0
4 files changed, 22 insertions(+), 4 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 24e1e2d9..ef7758ad 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -28,6 +28,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 77%
rename from Dockerfile
rename to docker/Dockerfile.dev
index 24e1e2d9..24608526 100644
--- a/Dockerfile
+++ b/docker/Dockerfile.dev
@@ -16,7 +16,8 @@
# limitations under the License.
#
-FROM postgres:12
+
+FROM postgres:12-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-12
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
