Updated dockerfile and docker-build-exec.sh

Yen · Apr 19, 2023 · 73f187f · 73f187f
1 parent 0ee2e55
commit 73f187f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -153,6 +153,14 @@ RUN set -eux; \
 	\
 	postgres --version
 
+# add the dependencies for postgres_web3
+RUN set -eux; \
+	\
+	apk add --no-cache --virtual .build-deps \
+		libc-dev \
+		clang16 \
+		make;
+
 # copy the postgres_web3 sources
 RUN mkdir -p /usr/src/postgres_web3
 COPY Makefile postgres_web3--*.sql postgres_web3.control README.postgres_web3 /usr/src/postgres_web3
@@ -161,10 +169,6 @@ COPY src /usr/src/postgres_web3/src
 # make and install postgres_web3
 RUN set -eux; \
 	\
-	apk add --no-cache --virtual .build-deps \
-		libc-dev \
-		clang16 \
-		make; \
 	make -C /usr/src/postgres_web3 -j "$(nproc)"; \
 	make -C /usr/src/postgres_web3 install; \
 	rm -rf /usr/src/postgres_web3; \

diff --git a/docker-build-exec.sh b/docker-build-exec.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # build the docker image
 IMAGE=$(docker build -q .)
 # start a detached container