Skip to content

Commit

Permalink
fix docker build ci context error (#610)
Browse files Browse the repository at this point in the history
Signed-off-by: xieydd <[email protected]>
  • Loading branch information
xieydd authored Nov 5, 2024
1 parent 60cedfa commit 1b97989
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release_enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
- name: Push postgres with pgvecto.rs enterprise to Docker Registry
uses: docker/build-push-action@v4
with:
context: .
context: ./docker/pg-cnpg
push: true
platforms: "linux/${{ matrix.platform }}"
file: ./docker/pg-cnpg/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_pg_slim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Push binary release to Docker Registry
uses: docker/build-push-action@v4
with:
context: .
context: ./docker/pg-slim
push: true
platforms: "linux/${{ matrix.platform }}"
file: ./docker/pg-slim/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions docker/pg-cnpg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN if [ -z "${PGDATA}" ]; then echo "PGDATA is not set"; exit 1; fi

# Install trunk
COPY --from=builder /usr/local/cargo/bin/trunk /usr/bin/trunk
COPY ./requirements.txt .
COPY requirements.txt .

# Install barman-cloud
RUN set -xe; \
Expand Down Expand Up @@ -171,7 +171,7 @@ RUN git clone https://github.com/EnterpriseDB/pg_failover_slots.git && \
ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

# Test trunk
COPY ./trunk-install.sh /usr/local/bin/
COPY trunk-install.sh /usr/local/bin/

# Change the uid of postgres to 26
RUN usermod -u 26 postgres
Expand Down
2 changes: 1 addition & 1 deletion docker/pg-slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ RUN install --verbose --directory --owner postgres --group postgres --mode 3777
RUN install --verbose --directory --owner postgres --group postgres --mode 1777 ${PGDATA}

ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin:/usr/local/bin
COPY ./docker-entrypoint.sh ./docker-ensure-initdb.sh /usr/local/bin/
COPY docker-entrypoint.sh docker-ensure-initdb.sh /usr/local/bin/
RUN ln -sT docker-ensure-initdb.sh /usr/local/bin/docker-enforce-initdb.sh
ENTRYPOINT ["docker-entrypoint.sh"]

Expand Down

0 comments on commit 1b97989

Please sign in to comment.