Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/build_client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
jobs:
docker_buildx_debian:
runs-on: ubuntu-latest
timeout-minutes: 15
timeout-minutes: 30
steps:
- name: Perform setup steps
uses: JonasAlfredsson/checkout-qemu-buildx@v2
Expand All @@ -41,6 +41,7 @@ jobs:
linux/386
linux/arm64
linux/arm/v7
linux/riscv64
push: ${{ github.event_name != 'pull_request' }}
tags: |
jonasal/devpi-client:latest
Expand All @@ -51,7 +52,7 @@ jobs:

docker_buildx_alpine:
runs-on: ubuntu-latest
timeout-minutes: 15
timeout-minutes: 30
steps:
- name: Perform setup steps
uses: JonasAlfredsson/checkout-qemu-buildx@v2
Expand All @@ -73,6 +74,7 @@ jobs:
linux/386
linux/arm64
linux/arm/v7
linux/riscv64
push: ${{ github.event_name != 'pull_request' }}
tags: |
jonasal/devpi-client:latest-alpine
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
jobs:
docker_buildx_debian:
runs-on: ubuntu-latest
timeout-minutes: 40
timeout-minutes: 120
steps:
- name: Perform setup steps
uses: JonasAlfredsson/checkout-qemu-buildx@v2
Expand All @@ -41,6 +41,7 @@ jobs:
linux/386
linux/arm64
linux/arm/v7
linux/riscv64
push: ${{ github.event_name != 'pull_request' }}
tags: |
jonasal/devpi-server:latest
Expand All @@ -51,7 +52,7 @@ jobs:

docker_buildx_alpine:
runs-on: ubuntu-latest
timeout-minutes: 40
timeout-minutes: 240
steps:
- name: Perform setup steps
uses: JonasAlfredsson/checkout-qemu-buildx@v2
Expand All @@ -73,6 +74,7 @@ jobs:
linux/386
linux/arm64
linux/arm/v7
linux/riscv64
push: ${{ github.event_name != 'pull_request' }}
tags: |
jonasal/devpi-server:latest-alpine
Expand Down
4 changes: 2 additions & 2 deletions client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build-alpine: Makefile Dockerfile
# Ssee link for more info about how these work:
# https://github.com/JonasAlfredsson/docker-nginx-certbot/issues/28
dev: Makefile Dockerfile
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7 --tag jonasal/devpi-client:dev -f ./Dockerfile ./
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/riscv64 --tag jonasal/devpi-client:dev -f ./Dockerfile ./

dev-alpine: Makefile Dockerfile
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7 --tag jonasal/devpi-client:dev-alpine -f ./Dockerfile-alpine ./
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/riscv64 --tag jonasal/devpi-client:dev-alpine -f ./Dockerfile-alpine ./
2 changes: 2 additions & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ RUN set -ex && \
build-essential \
libffi8 \
libffi-dev \
cargo \
&& \
# Install Python dependencies.
pip install --no-cache-dir -r /requirements.txt && \
# Remove everything that is no longer necessary.
apt-get remove --purge -y \
build-essential \
libffi-dev \
cargo \
&& \
apt-get autoremove -y && \
apt-get clean && \
Expand Down
7 changes: 6 additions & 1 deletion server/Dockerfile-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ RUN apk add --no-cache \
musl-dev \
libffi \
libffi-dev \
cargo \
libgcc \
&& \
pip install --no-cache-dir -r /requirements.txt \
&& \
apk del \
gcc \
musl-dev \
libffi-dev
libffi-dev \
cargo \
&& \
rm -rf /root/.cache

COPY entrypoint.sh /
ENTRYPOINT [ "/entrypoint.sh" ]
Expand Down
4 changes: 2 additions & 2 deletions server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build-alpine: Makefile Dockerfile
# See link for more info about how these work:
# https://github.com/JonasAlfredsson/docker-nginx-certbot/issues/28
dev: Makefile Dockerfile
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7 --tag jonasal/devpi-server:dev -f ./Dockerfile ./
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/riscv64 --tag jonasal/devpi-server:dev -f ./Dockerfile ./

dev-alpine: Makefile Dockerfile
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7 --tag jonasal/devpi-server:dev-alpine -f ./Dockerfile-alpine ./
docker buildx build --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/riscv64 --tag jonasal/devpi-server:dev-alpine -f ./Dockerfile-alpine ./