Skip to content

Commit 47300ab

Browse files
committed
Save
1 parent 003c2f8 commit 47300ab

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

docker/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ ARG GO_VERSION=1.23.0
5757
ENV CARGO_HOME="${HOME}/.cargo"
5858
ENV PATH="${PATH}:/usr/local/go/bin:${CARGO_HOME}/bin"
5959

60-
# RUN chown -R postgres:postgres "$HOME"
61-
6260
# Install PostgreSQL, extensions and contribs
6361
ENV POSTGIS_VERSION=3.4 \
6462
BG_MON_COMMIT=ef60961eff92672b1e21f5260dc1211367da6f1f \
@@ -100,10 +98,10 @@ WORKDIR /
10098

10199
RUN bash /builddeps/patroni_wale.sh
102100

103-
RUN if [ "$COMPRESS" = "true" ]; then bash /builddeps/compress_build.sh; fi
101+
# COPY pgcat.toml /etc/pgcat/config.toml
102+
# COPY postgrest.conf /etc/postgrest/postgrest.conf
104103

105-
COPY pgcat.toml /etc/pgcat/config.toml
106-
COPY postgrest.conf /etc/postgrest/postgrest.conf
104+
RUN if [ "$COMPRESS" = "true" ]; then bash /builddeps/compress_build.sh; fi
107105

108106

109107
FROM builder

docker/build_scripts/base.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@ else
5454
pkg-config
5555
software-properties-common
5656
dirmngr
57-
r-base
5857
jq)
59-
apt-get install -y --no-install-recommends "${BUILD_PACKAGES[@]}"
58+
apt-get install -y --no-install-recommends "${BUILD_PACKAGES[@]}" r-base
6059

6160

6261
rm -rf /usr/local/go && curl -sL "https://go.dev/dl/go$GO_VERSION.linux-$ARCH.tar.gz" | tar -xz -C /usr/local

0 commit comments

Comments
 (0)