Skip to content

Try fixing docker #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JelteF wants to merge 13 commits into from
Closed

Try fixing docker #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
06cae8a
Try fixing docker
JelteF Jan 31, 2025
781006f
Revert "Try fixing docker"
JelteF Jan 31, 2025
8262905
Temporarily disable arm build
JelteF Jan 31, 2025
8ddf4d6
Try apt-get upgrade
JelteF Feb 1, 2025
7be0a3b
Update Dockerfile
Y-- Feb 5, 2025
fa1b451
[wip] only 14 for now
Y-- Feb 5, 2025
f452aa9
Update docker.yaml
Y-- Feb 5, 2025
899627c
Update Dockerfile
Y-- Feb 5, 2025
635b6b8
Update Dockerfile
Y-- Feb 5, 2025
85ecefe
Revert other changes
Y-- Feb 5, 2025
17e0aae
Only use 1 cpu
Y-- Feb 5, 2025
7cc2b9f
make it
Y-- Feb 6, 2025
0bcc1c5
Only ARM for now
Y-- Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
matrix:
postgres: ["14", "15", "16", "17"]

env:
BUILDKIT_PROGRESS: plain
steps:
- name: Login to Docker Hub
uses: docker/login-action@v3
Expand All @@ -38,14 +40,14 @@ jobs:
- name: Set up Docker buildx
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
- name: docker bake
uses: docker/bake-action@v5
with:
targets: pg_duckdb_${{ matrix.postgres }}
push: true
set: |
*.platform=linux/amd64,linux/arm64
*.platform=linux/amd64
*.cache-to=type=gha,mode=max
*.cache-from=type=gha
postgres.tags=pgduckdb/pgduckdb:${{ matrix.postgres }}-${{ github.sha }}
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ FROM postgres_base AS base
FROM base AS builder
ARG POSTGRES_VERSION

RUN apt-get update -qq && \
RUN apt-get update -qq && apt-get upgrade && \
apt-get install -y python3.11-minimal && \
apt-get install -y python3-yaml && \
apt-get install -y \
postgresql-server-dev-${POSTGRES_VERSION} \
build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev \
Expand Down Expand Up @@ -38,7 +40,7 @@ COPY --chown=postgres:postgres test test
RUN make clean-all

# build
RUN --mount=type=cache,target=/ccache/,uid=999,gid=999 echo "Available CPUs=$(nproc)" && make -j$(nproc)
RUN --mount=type=cache,target=/ccache/,uid=999,gid=999 echo "Available CPUs=$(nproc)" && DUCKDB_GEN=make make -j1
# install into location specified by pg_config for tests
RUN make install
# install into /out for packaging
Expand Down